ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Fix uninitialized member variable"

Browse source
This commit is contained in:
Treehugger Robot 2017-05-11 19:17:19 +00:00 • committed by Gerrit Code Review
commit 46bb1ffa8a
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
libutils/FileMap.cpp
View file

@ -48,8 +48,16 @@ using namespace android;
// Constructor. Create an empty object. // Constructor. Create an empty object.
FileMap::FileMap(void) FileMap::FileMap(void)
: mFileName(NULL), mBasePtr(NULL), mBaseLength(0), : mFileName(NULL),
mDataPtr(NULL), mDataLength(0) mBasePtr(NULL),
mBaseLength(0),
mDataPtr(NULL),
mDataLength(0)
#if defined(__MINGW32__)
,
mFileHandle(INVALID_HANDLE_VALUE),
mFileMapping(NULL)
#endif
{ {
} }
@ -65,8 +73,8 @@ FileMap::FileMap(FileMap&& other)
other.mBasePtr = NULL; other.mBasePtr = NULL;
other.mDataPtr = NULL; other.mDataPtr = NULL;
#if defined(__MINGW32__) #if defined(__MINGW32__)
other.mFileHandle = 0; other.mFileHandle = INVALID_HANDLE_VALUE;
other.mFileMapping = 0; other.mFileMapping = NULL;
#endif #endif
} }
@ -84,8 +92,8 @@ FileMap& FileMap::operator=(FileMap&& other) {
#if defined(__MINGW32__) #if defined(__MINGW32__)
mFileHandle = other.mFileHandle; mFileHandle = other.mFileHandle;
mFileMapping = other.mFileMapping; mFileMapping = other.mFileMapping;
other.mFileHandle = 0; other.mFileHandle = INVALID_HANDLE_VALUE;
other.mFileMapping = 0; other.mFileMapping = NULL;
#endif #endif
return *this; return *this;
} }
@ -101,7 +109,7 @@ FileMap::~FileMap(void)
ALOGD("UnmapViewOfFile(%p) failed, error = %lu\n", mBasePtr, ALOGD("UnmapViewOfFile(%p) failed, error = %lu\n", mBasePtr,
GetLastError() ); GetLastError() );
} }
if (mFileMapping != INVALID_HANDLE_VALUE) { if (mFileMapping != NULL) {
CloseHandle(mFileMapping); CloseHandle(mFileMapping);
} }
#else #else
@ -156,7 +164,7 @@ bool FileMap::create(const char* origFileName, int fd, off64_t offset, size_t le
ALOGE("MapViewOfFile(%" PRId64 ", %zu) failed with error %lu\n", ALOGE("MapViewOfFile(%" PRId64 ", %zu) failed with error %lu\n",
adjOffset, adjLength, GetLastError() ); adjOffset, adjLength, GetLastError() );
CloseHandle(mFileMapping); CloseHandle(mFileMapping);
mFileMapping = INVALID_HANDLE_VALUE; mFileMapping = NULL;
return false; return false;
} }
#else // !defined(__MINGW32__) #else // !defined(__MINGW32__)