Merge "Fix remaining pointer leaks in Asset.cpp" (1ea486b5) · Commits · e / os / android_frameworks_base

libs/androidfw/Asset.cpp

+9 −3

Original line number	Original line	Diff line number	Diff line
	@@ -253,8 +253,10 @@ Asset::Asset(void)

	pAsset = new _FileAsset;		pAsset = new _FileAsset;
	result = pAsset->openChunk(NULL, fd, offset, length);		result = pAsset->openChunk(NULL, fd, offset, length);
	if (result != NO_ERROR)		if (result != NO_ERROR) {
			delete pAsset;
	return NULL;		return NULL;
			}

	pAsset->mAccessMode = mode;		pAsset->mAccessMode = mode;
	return pAsset;		return pAsset;
	@@ -273,8 +275,10 @@ Asset::Asset(void)
	pAsset = new _CompressedAsset;		pAsset = new _CompressedAsset;
	result = pAsset->openChunk(fd, offset, compressionMethod,		result = pAsset->openChunk(fd, offset, compressionMethod,
	uncompressedLen, compressedLen);		uncompressedLen, compressedLen);
	if (result != NO_ERROR)		if (result != NO_ERROR) {
			delete pAsset;
	return NULL;		return NULL;
			}

	pAsset->mAccessMode = mode;		pAsset->mAccessMode = mode;
	return pAsset;		return pAsset;
	@@ -328,8 +332,10 @@ Asset::Asset(void)

	pAsset = new _CompressedAsset;		pAsset = new _CompressedAsset;
	result = pAsset->openChunk(dataMap, uncompressedLen);		result = pAsset->openChunk(dataMap, uncompressedLen);
	if (result != NO_ERROR)		if (result != NO_ERROR) {
			delete pAsset;
	return NULL;		return NULL;
			}

	pAsset->mAccessMode = mode;		pAsset->mAccessMode = mode;
	return pAsset;		return pAsset;