WebPMuxCreate() error handling:

Directly return NULL if no allocation is done yet.

Change-Id: If39ab7f5a55833263d3372fa0a5d9b0a600cb9ed
This commit is contained in:
Urvang Joshi 2012-07-02 11:17:24 +05:30
parent 777341c3d0
commit 5d09a244b7

View File

@ -89,21 +89,21 @@ WebPMux* WebPMuxCreateInternal(const WebPData* const bitstream, int copy_data,
ChunkInit(&chunk);
// Sanity checks.
if (version != WEBP_MUX_ABI_VERSION) goto Err; // version mismatch
if (bitstream == NULL) goto Err;
if (version != WEBP_MUX_ABI_VERSION) return NULL; // version mismatch
if (bitstream == NULL) return NULL;
data = bitstream->bytes_;
size = bitstream->size_;
if (data == NULL) goto Err;
if (data == NULL) return NULL;
if (size < RIFF_HEADER_SIZE) return NULL;
if (GetLE32(data + 0) != mktag('R', 'I', 'F', 'F') ||
GetLE32(data + CHUNK_HEADER_SIZE) != mktag('W', 'E', 'B', 'P')) {
goto Err;
return NULL;
}
mux = WebPMuxNew();
if (mux == NULL) goto Err;
if (mux == NULL) return NULL;
if (size < RIFF_HEADER_SIZE + TAG_SIZE) goto Err;