From: Greg Beaver <cellog@php.net>
Date: Sun, 6 Jan 2008 05:16:20 +0000 (+0000)
Subject: fix typo in phar.c if bz2 is disabled
X-Git-Tag: RELEASE_2_0_0a1~1009
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=99922cb729bedb6a2d8f978286d4ca0d8f68b0d6;p=php

fix typo in phar.c if bz2 is disabled
---

diff --git a/ext/phar/phar.c b/ext/phar/phar.c
index da2b861bc6..7f628e4041 100644
--- a/ext/phar/phar.c
+++ b/ext/phar/phar.c
@@ -1124,7 +1124,7 @@ int phar_open_zipfile(char *fname, int fname_len, char *alias, int alias_len, ph
 						}
 						zip_close(zip);
 						zend_hash_destroy(&(mydata->manifest));
-						mdata->manifest.arBuckets = NULL;
+						mydata->manifest.arBuckets = NULL;
 						efree(mydata);
 						if (error) {
 							spprintf(error, 0, "bz2 extension is required for Bzip2 compressed zip-based .phar file \"%s\"", fname);
@@ -1876,7 +1876,7 @@ int phar_open_filename(char *fname, int fname_len, char *alias, int alias_len, i
 	
 	if (phar_open_loaded(fname, fname_len, alias, alias_len, options, pphar, error TSRMLS_CC) == SUCCESS) {
 		return SUCCESS;
-	} else if (*error) {
+	} else if (error && *error) {
 		return FAILURE;
 	}