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

diff --git a/NEWS b/NEWS
index 0a24a7ed26316bf60bfc9c2d3dce86b8105b7308..6d74dccfe13f315c9c36068a32dfe5aa41063fa7 100644 (file)
--- 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 afc9099cf1a474e1b78bba1b90918583463ef715..b192ab7431a7a4354c0eca7b9220ce5777f77a7b 100644 (file)
--- 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
 }
 /* }}} */