From: Greg Beaver <cellog@php.net>
Date: Mon, 14 Apr 2008 22:39:27 +0000 (+0000)
Subject: fix invalid variable access
X-Git-Tag: RELEASE_2_0_0b1~393
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=023d1c96eae2fe97a50d6c2e210a315ca29a5f6f;p=php

fix invalid variable access
---

diff --git a/ext/phar/stream.c b/ext/phar/stream.c
index 03fe31b71a..a13159ac77 100644
--- a/ext/phar/stream.c
+++ b/ext/phar/stream.c
@@ -746,6 +746,13 @@ static int phar_wrapper_rename(php_stream_wrapper *wrapper, char *url_from, char
 		return 0;
 	}
 
+
+	if (SUCCESS != phar_get_archive(&pfrom, resource_from->host, strlen(resource_from->host), NULL, 0, &error TSRMLS_CC)) {
+		pfrom = NULL;
+		if (error) {
+			efree(error);
+		}
+	}
 	if (PHAR_G(readonly) && (!pfrom || !pfrom->is_data)) {
 		php_url_free(resource_from);
 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "phar error: write operations disabled by phar.readonly INI setting");
@@ -764,10 +771,10 @@ static int phar_wrapper_rename(php_stream_wrapper *wrapper, char *url_from, char
 		return 0;
 	}
 
-	if (SUCCESS != phar_get_archive(&pfrom, resource_from->host, strlen(resource_from->host), NULL, 0, &error TSRMLS_CC)) {
-		pfrom = NULL;
-	}
 	if (SUCCESS != phar_get_archive(&pto, resource_to->host, strlen(resource_to->host), NULL, 0, &error TSRMLS_CC)) {
+		if (error) {
+			efree(error);
+		}
 		pto = NULL;
 	}