]> granicus.if.org Git - php/commitdiff
MFB: Fixed bug #46887 (Invalid calls to php_error_docref())
authorIlia Alshanetsky <iliaa@php.net>
Thu, 18 Dec 2008 20:04:26 +0000 (20:04 +0000)
committerIlia Alshanetsky <iliaa@php.net>
Thu, 18 Dec 2008 20:04:26 +0000 (20:04 +0000)
ext/mysqli/mysqli.c
ext/xmlwriter/php_xmlwriter.c

index 6d168fe28da69b63ad2d7ec20e132ce3a3310945..99282c8dce3fae3cefa087f6c435c0a85abb6d28 100644 (file)
@@ -1390,7 +1390,7 @@ if (a) {\
 #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
index 59d1c33460931f34fd9c816f3084b036e9ed2194..cbbc14ed22e6de456d6c0c57b90c856cd00bdcf0 100644 (file)
@@ -168,7 +168,7 @@ static zend_object_value xmlwriter_object_new(zend_class_entry *class_type TSRML
 
 #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;   \
        }       \