From: Greg Beaver <cellog@php.net>
Date: Tue, 22 Apr 2008 17:34:00 +0000 (+0000)
Subject: ensure freeing of cwd/name happens in all cases
X-Git-Tag: RELEASE_2_0_0b1~262
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5224d341b698ee2d19b23018735e5598abff953c;p=php

ensure freeing of cwd/name happens in all cases
---

diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c
index eacf4e9c95..62a4698167 100755
--- a/ext/phar/phar_object.c
+++ b/ext/phar/phar_object.c
@@ -313,13 +313,13 @@ static int phar_file_action(phar_entry_data *phar, char *mime_type, int code, ch
 						}
 					}
 				} zend_catch {
-					if (PHAR_G(cwd)) {
-						efree(PHAR_G(cwd));
-						PHAR_G(cwd) = NULL;
-						PHAR_G(cwd_len) = 0;
-					}
-					efree(name);
 				} zend_end_try();
+				if (PHAR_G(cwd)) {
+					efree(PHAR_G(cwd));
+					PHAR_G(cwd) = NULL;
+					PHAR_G(cwd_len) = 0;
+				}
+				efree(name);
 				zend_bailout();
 			}
 			return PHAR_MIME_PHP;