cvs: php4 /ext/bz2 bz2.c

sniper Wed Dec 5 23:09:14 2001 EDT Modified files: /php4/ext/bz2 bz2.c Log: Fixed bug which was introduced by the last optimizing "fixes". Index: php4/ext/bz2/bz2.c diff -u php4/ext/bz2/bz2.c:1.29 php4/ext/bz2/bz2.c:1.30 --- php4/ext/bz2/bz2.c:1.29 Thu Nov 1 04:45:25 2001 +++ php4/ext/bz2/bz2.c Wed Dec 5 23:09:14 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: bz2.c,v 1.29 2001/11/01 09:45:25 jeroen Exp $ */ +/* $Id: bz2.c,v 1.30 2001/12/06 04:09:14 sniper Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -312,15 +312,14 @@ } error = BZ2_bzBuffToBuffCompress(dest, &size, Z_STRVAL_PP(source), Z_STRLEN_PP(source), block_size, 0, work_factor); + if (error != BZ_OK) { - efree(dest); php_error(E_WARNING, "bzcompress failed"); - RETURN_FALSE; + RETVAL_FALSE; + } else { + RETVAL_STRINGL(dest, size, 1); } - - /* size down... */ - dest = erealloc(dest, size); - RETURN_STRINGL(dest, size, 0); + efree(dest); } /* }}} */ @@ -366,14 +365,12 @@ } while (error == BZ_OUTBUFF_FULL); if (error != BZ_OK) { - efree(dest); php_error(E_WARNING, "bzdecompress failed"); - RETURN_FALSE; + RETVAL_FALSE; + } else { + RETVAL_STRINGL(dest, size, 1); } - - /* we might have allocated a little to much, so realloc down. */ - dest = erealloc(dest, size); - RETURN_STRINGL(dest, size, 0); + efree(dest); } /* }}} */