From 5d09a244b74952809ded1f30d0cbf15d6cd8be92 Mon Sep 17 00:00:00 2001
From: Urvang Joshi <urvang@google.com>
Date: Mon, 2 Jul 2012 11:17:24 +0530
Subject: [PATCH] WebPMuxCreate() error handling:

Directly return NULL if no allocation is done yet.

Change-Id: If39ab7f5a55833263d3372fa0a5d9b0a600cb9ed
---
 src/mux/muxread.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/mux/muxread.c b/src/mux/muxread.c
index 10d46b21..b294c770 100644
--- a/src/mux/muxread.c
+++ b/src/mux/muxread.c
@@ -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;