iliaa Thu Dec 18 20:04:26 2008 UTC
Modified files:
/php-src/ext/xmlwriter php_xmlwriter.c
/php-src/ext/mysqli mysqli.c
Log:
MFB: Fixed bug #46887 (Invalid calls to php_error_docref())
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlwriter/php_xmlwriter.c?r1=1.57&r2=1.58&diff_format=u
Index: php-src/ext/xmlwriter/php_xmlwriter.c
diff -u php-src/ext/xmlwriter/php_xmlwriter.c:1.57
php-src/ext/xmlwriter/php_xmlwriter.c:1.58
--- php-src/ext/xmlwriter/php_xmlwriter.c:1.57 Mon Nov 17 11:26:25 2008
+++ php-src/ext/xmlwriter/php_xmlwriter.c Thu Dec 18 20:04:26 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_xmlwriter.c,v 1.57 2008/11/17 11:26:25 felipe Exp $ */
+/* $Id: php_xmlwriter.c,v 1.58 2008/12/18 20:04:26 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.138&r2=1.139&diff_format=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.138 php-src/ext/mysqli/mysqli.c:1.139
--- php-src/ext/mysqli/mysqli.c:1.138 Thu Nov 27 19:02:44 2008
+++ php-src/ext/mysqli/mysqli.c Thu Dec 18 20:04:26 2008
@@ -17,7 +17,7 @@
| Ulf Wendel <u...@php.net> |
+----------------------------------------------------------------------+
- $Id: mysqli.c,v 1.138 2008/11/27 19:02:44 dmitry Exp $
+ $Id: mysqli.c,v 1.139 2008/12/18 20:04:26 iliaa Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1390,7 +1390,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
