iliaa Thu Dec 18 20:02:20 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/xmlwriter php_xmlwriter.c
/php-src/ext/mysqli mysqli.c
Log:
Fixed bug #46887 (Invalid calls to php_error_docref())
# Patch by oeriksson at mandriva dot com and crrodriguez at opensuse dot org
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlwriter/php_xmlwriter.c?r1=1.20.2.12.2.15.2.9&r2=1.20.2.12.2.15.2.10&diff_format=u
Index: php-src/ext/xmlwriter/php_xmlwriter.c
diff -u php-src/ext/xmlwriter/php_xmlwriter.c:1.20.2.12.2.15.2.9
php-src/ext/xmlwriter/php_xmlwriter.c:1.20.2.12.2.15.2.10
--- php-src/ext/xmlwriter/php_xmlwriter.c:1.20.2.12.2.15.2.9 Mon Nov 17
11:28:00 2008
+++ php-src/ext/xmlwriter/php_xmlwriter.c Thu Dec 18 20:02:19 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_xmlwriter.c,v 1.20.2.12.2.15.2.9 2008/11/17 11:28:00 felipe Exp $
*/
+/* $Id: php_xmlwriter.c,v 1.20.2.12.2.15.2.10 2008/12/18 20:02:19 iliaa Exp $
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -168,7 +168,7 @@
#define XMLW_NAME_CHK(__err) \
if (xmlValidateName((xmlChar *) name, 0) != 0) { \
- php_error_docref(NULL TSRMLS_CC, E_WARNING, __err); \
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", __err);
\
RETURN_FALSE; \
} \
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.72.2.16.2.17.2.33&r2=1.72.2.16.2.17.2.34&diff_format=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.33
php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.34
--- php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.33 Thu Nov 27 19:01:22 2008
+++ php-src/ext/mysqli/mysqli.c Thu Dec 18 20:02:20 2008
@@ -17,7 +17,7 @@
| Ulf Wendel <u...@php.net> |
+----------------------------------------------------------------------+
- $Id: mysqli.c,v 1.72.2.16.2.17.2.33 2008/11/27 19:01:22 dmitry Exp $
+ $Id: mysqli.c,v 1.72.2.16.2.17.2.34 2008/12/18 20:02:20 iliaa Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1352,7 +1352,7 @@
#define LOCAL_INFILE_ERROR_MSG(source,dest)\
memset(source, 0, LOCAL_INFILE_ERROR_LEN);\
memcpy(source, dest, MIN(strlen(dest), LOCAL_INFILE_ERROR_LEN-1));\
- php_error_docref(NULL TSRMLS_CC, E_WARNING, dest);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", dest);
/* {{{ php_local_infile_init
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
