Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:80568
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Received-SPF: pass (pb1.pair.com: domain gmail.com designates 74.125.82.175 as permitted sender)
Sender: Michael Wallner <mike.php.net@gmail.com>
Message-ID: <54B7EDAC.3060005@php.net>
Date: Thu, 15 Jan 2015 17:41:16 +0100
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.2.0
MIME-Version: 1.0
To: internals@lists.php.net
References: <1421339511-9078-1-git-send-email-git@internot.info>
In-Reply-To: <1421339511-9078-1-git-send-email-git@internot.info>
Content-Type: text/plain; charset=windows-1252
Content-Transfer-Encoding: 7bit
Subject: Re: [PHP-DEV] [PATCH] Fixed bug #68839 Possible null pointer dereference
From: mike@php.net (Michael Wallner)

On 15/01/15 17:31, Joshua Rogers wrote:
> ---
>  ext/phar/zip.c | 12 +++++++++---
>  1 file changed, 9 insertions(+), 3 deletions(-)
> 
> diff --git a/ext/phar/zip.c b/ext/phar/zip.c
> index 2a95580..2117b0e 100644
> --- a/ext/phar/zip.c
> +++ b/ext/phar/zip.c
> @@ -1217,7 +1217,9 @@ int phar_zip_flush(phar_archive_data *phar, char *user_stub, zend_long len, int
>  	if (!phar->is_temporary_alias && phar->alias_len) {
>  		entry.fp = php_stream_fopen_tmpfile();
>  		if (entry.fp == NULL) {
> -			spprintf(error, 0, "phar error: unable to create temporary file");
> +			if (error) {
> +				spprintf(error, 0, "phar error: unable to create temporary file");
> +			}
>  			return EOF;
>  		}
>  		if (phar->alias_len != (int)php_stream_write(entry.fp, phar->alias, phar->alias_len)) {
> @@ -1309,7 +1311,9 @@ int phar_zip_flush(phar_archive_data *phar, char *user_stub, zend_long len, int
>  		len = pos - user_stub + 18;
>  		entry.fp = php_stream_fopen_tmpfile();
>  		if (entry.fp == NULL) {
> -			spprintf(error, 0, "phar error: unable to create temporary file");
> +			if (error) {
> +				spprintf(error, 0, "phar error: unable to create temporary file");
> +			}
>  			return EOF;
>  		}
>  		entry.uncompressed_filesize = len + 5;
> @@ -1346,7 +1350,9 @@ int phar_zip_flush(phar_archive_data *phar, char *user_stub, zend_long len, int
>  		/* Either this is a brand new phar (add the stub), or the default stub is required (overwrite the stub) */
>  		entry.fp = php_stream_fopen_tmpfile();
>  		if (entry.fp == NULL) {
> -			spprintf(error, 0, "phar error: unable to create temporary file");
> +			if (error) {
> +				spprintf(error, 0, "phar error: unable to create temporary file");
> +			}
>  			return EOF;
>  		}
>  		if (sizeof(newstub)-1 != php_stream_write(entry.fp, newstub, sizeof(newstub)-1)) {
> 

Looks good.

-- 
Regards,
Mike