From: Ilia Alshanetsky <iliaa@php.net>
Date: Thu, 18 Dec 2008 20:02:20 +0000 (+0000)
Subject: Fixed bug #46887 (Invalid calls to php_error_docref())
X-Git-Tag: php-5.3.0beta1~404
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c9f030f57667ad7c7768bab15014b0af20b47510;p=php

Fixed bug #46887 (Invalid calls to php_error_docref())

# Patch by oeriksson at mandriva dot com and crrodriguez at opensuse dot org
---

diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c
index 9309545d06..4e6a1d0a66 100644
--- a/ext/mysqli/mysqli.c
+++ b/ext/mysqli/mysqli.c
@@ -1352,7 +1352,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 3c990b0db1..a0c503359f 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;	\
 	}	\