From: foobar <sniper@php.net>
Date: Sat, 2 Apr 2005 06:03:14 +0000 (+0000)
Subject: - Fixed bug #32538 (ext/swf/swf.c does not compile with gcc-3.4.x or newer)
X-Git-Tag: php-4.4.0RC1~169
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=40ebf7dbc1798a083811d71a60706d8e62b31554;p=php

- Fixed bug #32538 (ext/swf/swf.c does not compile with gcc-3.4.x or newer)
---

diff --git a/NEWS b/NEWS
index 0a24a7ed26..6d74dccfe1 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,8 @@ PHP 4                                                                      NEWS
 ?? ??? 20??, Version 4.?.?
 - Added the sorting flag SORT_LOCALE_STRING to the sort() functions which makes
   them sort based on the current locale. (Derick)
+- Fixed bug #32538 (ext/swf/swf.c does not compile with gcc-3.4.x or newer).
+  (adam dot greenfield at gmail dot com)
 
 31 Mar 2005, Version 4.3.11
 - Added Oracle Instant Client support. (cjbj at hotmail dot com, Tony)
diff --git a/ext/swf/swf.c b/ext/swf/swf.c
index afc9099cf1..b192ab7431 100644
--- a/ext/swf/swf.c
+++ b/ext/swf/swf.c
@@ -240,7 +240,10 @@ PHP_FUNCTION(swf_openfile)
 	na = tmpna;
 #endif
 	if (php_check_open_basedir(na TSRMLS_CC) || (PG(safe_mode) && !php_checkuid(na, "wb+", CHECKUID_CHECK_MODE_PARAM))) {
-		goto err;
+#ifdef VIRTUAL_DIR
+		free(na);
+#endif
+		return;
 	}
 	
 	if (!SWFG(use_file))
@@ -249,10 +252,6 @@ PHP_FUNCTION(swf_openfile)
 	swf_openfile(na,(float)Z_DVAL_PP(sizeX), (float)Z_DVAL_PP(sizeY),
       		 	 (float)Z_DVAL_PP(frameRate), (float)Z_DVAL_PP(r), 
       		 	 (float)Z_DVAL_PP(g), (float)Z_DVAL_PP(b));
-err:
-#ifdef VIRTUAL_DIR
-	free(na);
-#endif
 }
 /* }}} */