summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlia Alshanetsky <iliaa@php.net>2008-12-18 20:08:00 +0000
committerIlia Alshanetsky <iliaa@php.net>2008-12-18 20:08:00 +0000
commit444aba4d5f258c4e6b072b10445e606bf82d5f25 (patch)
treefdcfdfd974d079490658c0c494f53b6838a1fe05
parentabda35380f73435e3f37c80300d6f0ca5219ddfe (diff)
downloadphp-git-444aba4d5f258c4e6b072b10445e606bf82d5f25.tar.gz
MFB: Fixed bug #46887 (Invalid calls to php_error_docref())
-rw-r--r--NEWS4
-rw-r--r--ext/xmlwriter/php_xmlwriter.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 98a1b339ca..2e5b8ba68f 100644
--- a/NEWS
+++ b/NEWS
@@ -6,7 +6,9 @@ PHP NEWS
- Fixed security issue in imagerotate(), background colour isn't validated
correctly with a non truecolour image. (Fixes CVE-2008-5498) (Scott)
-- Fixed bug #46889: Memory leak in strtotime(). (Derick)
+- Fixed bug #46889 (Memory leak in strtotime()). (Derick)
+- Fixed bug #46887 (Invalid calls to php_error_docref()).
+ (oeriksson at mandriva dot com, Ilia)
- Fixed bug #46798 (Crash in mssql extension when retrieving a NULL value
inside a binary or image column type). (Ilia)
- Fixed bug #46782 (fastcgi.c parse error). (Matt)
diff --git a/ext/xmlwriter/php_xmlwriter.c b/ext/xmlwriter/php_xmlwriter.c
index fbffcaece7..65e3d54e70 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; \
} \