--- embedaddon/php/ext/bz2/bz2.c 2012/05/29 12:34:36 1.1.1.2 +++ embedaddon/php/ext/bz2/bz2.c 2014/06/15 20:03:41 1.1.1.4 @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2012 The PHP Group | + | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: bz2.c,v 1.1.1.2 2012/05/29 12:34:36 misho Exp $ */ +/* $Id: bz2.c,v 1.1.1.4 2014/06/15 20:03:41 misho Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -229,6 +229,9 @@ PHP_BZ2_API php_stream *_php_stream_bz2open(php_stream #endif if (php_check_open_basedir(path_copy TSRMLS_CC)) { +#ifdef VIRTUAL_DIR + free(path_copy); +#endif return NULL; } @@ -238,6 +241,9 @@ PHP_BZ2_API php_stream *_php_stream_bz2open(php_stream if (opened_path && bz_file) { *opened_path = estrdup(path_copy); } +#ifdef VIRTUAL_DIR + free(path_copy); +#endif path_copy = NULL; if (bz_file == NULL) { @@ -518,7 +524,7 @@ static PHP_FUNCTION(bzcompress) efree(dest); RETURN_LONG(error); } else { - /* Copy the buffer, we have perhaps allocate alot more than we need, + /* Copy the buffer, we have perhaps allocate a lot more than we need, so we erealloc() the buffer to the proper size */ dest = erealloc(dest, dest_len + 1); dest[dest_len] = 0;