sniper Sat Apr 2 01:03:15 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-src NEWS
/php-src/ext/swf swf.c
Log:
- Fixed bug #32538 (ext/swf/swf.c does not compile with gcc-3.4.x or newer)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.866&r2=1.1247.2.867&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.866 php-src/NEWS:1.1247.2.867
--- php-src/NEWS:1.1247.2.866 Thu Mar 31 03:18:39 2005
+++ php-src/NEWS Sat Apr 2 01:03:12 2005
@@ -3,6 +3,8 @@
?? ??? 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)
http://cvs.php.net/diff.php/php-src/ext/swf/swf.c?r1=1.46.2.4&r2=1.46.2.5&ty=u
Index: php-src/ext/swf/swf.c
diff -u php-src/ext/swf/swf.c:1.46.2.4 php-src/ext/swf/swf.c:1.46.2.5
--- php-src/ext/swf/swf.c:1.46.2.4 Thu Dec 23 13:29:36 2004
+++ php-src/ext/swf/swf.c Sat Apr 2 01:03:14 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: swf.c,v 1.46.2.4 2004/12/23 18:29:36 iliaa Exp $ */
+/* $Id: swf.c,v 1.46.2.5 2005/04/02 06:03:14 sniper Exp $ */
#ifdef HAVE_CONFIG_H
@@ -240,7 +240,10 @@
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 @@
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
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
