ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

String8: ensure static init done prior to empty string reference

Browse Source 
Avoid NULL deref on static initialization of empty String8 objects prior
to libutils static init.

Change-Id: I3d420041ba62b97ed8c2dfd2532a2dcd72b84ff1
This commit is contained in:
Todd Poynor 2013-05-02 15:41:35 -07:00
parent 779434378e
commit 1bf3b4a06d
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/utils/String8.cpp
View File

@ -48,12 +48,16 @@ int gDarwinIsReallyAnnoying;
static inline char* getEmptyString()
{
if (!gEmptyStringBuf) initialize_string8();
gEmptyStringBuf->acquire();
return gEmptyString;
}
void initialize_string8()
{
if (gEmptyStringBuf) return;
// HACK: This dummy dependency forces linking libutils Static.cpp,
// which is needed to initialize String8/String16 classes.
// These variables are named for Darwin, but are needed elsewhere too,