From: Ilia Alshanetsky Date: Thu, 18 Dec 2008 20:04:26 +0000 (+0000) Subject: MFB: Fixed bug #46887 (Invalid calls to php_error_docref()) X-Git-Tag: php-5.4.0alpha1~191^2~4779 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=992033a41ce3b7ba61981edf66ae779e0fcd5c3a;p=php MFB: Fixed bug #46887 (Invalid calls to php_error_docref()) --- diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c index 6d168fe28d..99282c8dce 100644 --- a/ext/mysqli/mysqli.c +++ b/ext/mysqli/mysqli.c @@ -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 diff --git a/ext/xmlwriter/php_xmlwriter.c b/ext/xmlwriter/php_xmlwriter.c index 59d1c33460..cbbc14ed22 100644 --- a/ext/xmlwriter/php_xmlwriter.c +++ b/ext/xmlwriter/php_xmlwriter.c @@ -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; \ } \