Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d4529862 authored by Phillip Lougher's avatar Phillip Lougher Committed by H. Peter Anvin
Browse files

bzip2: Add missing checks for malloc returning NULL 



Signed-off-by: default avatarPhillip Lougher <phillip@lougher.demon.co.uk>
LKML-Reference: <4b26b1ef.ln20bM9Mn4gzB21L%phillip@lougher.demon.co.uk>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent c1e7c3ae

lib/decompress_bunzip2.c

+9 −1
Original line number Diff line number Diff line
@@ -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: