iliaa Tue Dec 9 17:22:12 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src NEWS
/php-src/ext/xmlrpc/libxmlrpc xml_element.c xmlrpc.c
Log:
MFH: Fixed bug #46746 (xmlrpc_decode_request outputs non-suppressable error
when given bad data).
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.408&r2=1.2027.2.547.2.965.2.409&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.408
php-src/NEWS:1.2027.2.547.2.965.2.409
--- php-src/NEWS:1.2027.2.547.2.965.2.408 Tue Dec 9 14:03:57 2008
+++ php-src/NEWS Tue Dec 9 17:22:12 2008
@@ -8,6 +8,8 @@
session_is_registered(). (Hannes)
- Fixed bug #46811 (ini_set() doesn't return false on failure). (Hannes)
+- Fixed bug #46746 (xmlrpc_decode_request outputs non-suppressable error when
+ given bad data). (Ilia)
04 Dec 2008, PHP 5.3.0 Alpha 3
- Upgraded bundled PCRE to version 7.8. (Nuno)
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/libxmlrpc/xml_element.c?r1=1.9.4.1&r2=1.9.4.1.2.1&diff_format=u
Index: php-src/ext/xmlrpc/libxmlrpc/xml_element.c
diff -u php-src/ext/xmlrpc/libxmlrpc/xml_element.c:1.9.4.1
php-src/ext/xmlrpc/libxmlrpc/xml_element.c:1.9.4.1.2.1
--- php-src/ext/xmlrpc/libxmlrpc/xml_element.c:1.9.4.1 Sun Jul 30 11:34:02 2006
+++ php-src/ext/xmlrpc/libxmlrpc/xml_element.c Tue Dec 9 17:22:12 2008
@@ -31,7 +31,7 @@
*/
-static const char rcsid[] = "#(@) $Id: xml_element.c,v 1.9.4.1 2006/07/30
11:34:02 tony2001 Exp $";
+static const char rcsid[] = "#(@) $Id: xml_element.c,v 1.9.4.1.2.1 2008/12/09
17:22:12 iliaa Exp $";
@@ -44,6 +44,11 @@
* 06/2000
* HISTORY
* $Log: xml_element.c,v $
+ * Revision 1.9.4.1.2.1 2008/12/09 17:22:12 iliaa
+ *
+ * MFH: Fixed bug #46746 (xmlrpc_decode_request outputs non-suppressable
error
+ * when given bad data).
+ *
* Revision 1.9.4.1 2006/07/30 11:34:02 tony2001
* MFH: fix compile warnings (#38257)
*
@@ -378,7 +383,7 @@
depth++;
if(!el) {
- fprintf(stderr, "Nothing to write\n");
+ /* fprintf(stderr, "Nothing to write\n"); */
return;
}
if(!options) {
@@ -725,7 +730,7 @@
byte_idx > 10 ? 10 : byte_idx,
in_buf + (byte_idx > 10 ? byte_idx - 10 : byte_idx));
}
-
+/*
fprintf(stderr, "expat reports error code %i\n"
"\tdescription: %s\n"
"\tline: %i\n"
@@ -734,7 +739,7 @@
"\ttotal bytes: %i\n%s ",
err_code, error_str, line_num,
col_num, byte_idx, byte_total, buf);
-
+*/
/* error condition */
if(error) {
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/libxmlrpc/xmlrpc.c?r1=1.8.4.3.2.1&r2=1.8.4.3.2.2&diff_format=u
Index: php-src/ext/xmlrpc/libxmlrpc/xmlrpc.c
diff -u php-src/ext/xmlrpc/libxmlrpc/xmlrpc.c:1.8.4.3.2.1
php-src/ext/xmlrpc/libxmlrpc/xmlrpc.c:1.8.4.3.2.2
--- php-src/ext/xmlrpc/libxmlrpc/xmlrpc.c:1.8.4.3.2.1 Wed Sep 10 00:07:44 2008
+++ php-src/ext/xmlrpc/libxmlrpc/xmlrpc.c Tue Dec 9 17:22:12 2008
@@ -31,7 +31,7 @@
*/
-static const char rcsid[] = "#(@) $Id: xmlrpc.c,v 1.8.4.3.2.1 2008/09/10
00:07:44 felipe Exp $";
+static const char rcsid[] = "#(@) $Id: xmlrpc.c,v 1.8.4.3.2.2 2008/12/09
17:22:12 iliaa Exp $";
/****h* ABOUT/xmlrpc
@@ -43,6 +43,11 @@
* 9/1999 - 10/2000
* HISTORY
* $Log: xmlrpc.c,v $
+ * Revision 1.8.4.3.2.2 2008/12/09 17:22:12 iliaa
+ *
+ * MFH: Fixed bug #46746 (xmlrpc_decode_request outputs non-suppressable
error
+ * when given bad data).
+ *
* Revision 1.8.4.3.2.1 2008/09/10 00:07:44 felipe
* MFH:
* - Merged fix from SF project (Import Jeff Lawsons patches for XML
datetime bug fixes)
@@ -1168,13 +1173,13 @@
}
}
else {
- fprintf (stderr,
- "xmlrpc:
attempted to add key/val pair to vector of type array\n");
+ /* fprintf (stderr,
+ "xmlrpc:
attempted to add key/val pair to vector of type array\n"); */
}
break;
default:
- fprintf (stderr,
- "xmlrpc: attempted to
add value of unknown type to vector\n");
+ /* fprintf (stderr,
+ "xmlrpc: attempted to
add value of unknown type to vector\n"); */
break;
}
}
@@ -1504,8 +1509,8 @@
my_free(value);
break;
default:
- fprintf (stderr,
- "xmlrpc: attempted to
free value of invalid type\n");
+ /* fprintf (stderr,
+ "xmlrpc: attempted to
free value of invalid type\n"); */
break;
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
