Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 10 insertions, 2 deletions

diff --git a/lib/decompress_bunzip2.c b/lib/decompress_bunzip2.c
index 600f473a5610..a4e971dee102 100644
--- a/lib/decompress_bunzip2.c
+++ b/lib/decompress_bunzip2.c
@@ -299,7 +299,7 @@ static int INIT get_next_block(struct bunzip_data *bd)
                    again when using them (during symbol decoding).*/
                 base = hufGroup->base-1;
                 limit = hufGroup->limit-1;
-                /* Calculate permute[].  Concurently, initialize
+                /* Calculate permute[].  Concurrently, initialize
                  * temp[] and limit[]. */
                 pp = 0;
                 for (i = minLen; i <= maxLen; i++) {
@@ -637,6 +637,8 @@ static int INIT start_bunzip(struct bunzip_data **bdp, void *inbuf, int len,
 
         /* Allocate bunzip_data.  Most fields initialize to zero. */
         bd = *bdp = malloc(i);
+        if (!bd)
+                return RETVAL_OUT_OF_MEMORY;
         memset(bd, 0, sizeof(struct bunzip_data));
         /* Setup input buffer */
         bd->inbuf = inbuf;
@@ -664,6 +666,8 @@ static int INIT start_bunzip(struct bunzip_data **bdp, void *inbuf, int len,
         bd->dbufSize = 100000*(i-BZh0);
 
         bd->dbuf = large_malloc(bd->dbufSize * sizeof(int));
+        if (!bd->dbuf)
+                return RETVAL_OUT_OF_MEMORY;
         return RETVAL_OK;
 }
 
@@ -686,7 +690,7 @@ STATIC int INIT bunzip2(unsigned char *buf, int len,
 
         if (!outbuf) {
                 error("Could not allocate output bufer");
-                return -1;
+                return RETVAL_OUT_OF_MEMORY;
         }
         if (buf)
                 inbuf = buf;
@@ -694,6 +698,7 @@ STATIC int INIT bunzip2(unsigned char *buf, int len,
                 inbuf = malloc(BZIP2_IOBUF_SIZE);
         if (!inbuf) {
                 error("Could not allocate input bufer");
+                i = RETVAL_OUT_OF_MEMORY;
                 goto exit_0;
         }
         i = start_bunzip(&bd, inbuf, len, fill);
@@ -720,11 +725,14 @@ STATIC int INIT bunzip2(unsigned char *buf, int len,
         } else if (i == RETVAL_UNEXPECTED_OUTPUT_EOF) {
                 error("Compressed file ends unexpectedly");
         }
+        if (!bd)
+                goto exit_1;
         if (bd->dbuf)
                 large_free(bd->dbuf);
         if (pos)
                 *pos = bd->inbufPos;
         free(bd);
+exit_1:
         if (!buf)
                 free(inbuf);
 exit_0: