rasmus                                   Thu, 27 Aug 2009 05:05:42 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=287790

Log:
This needs to be larger to avoid an overflow on the bit-shifting in this 
function

Changed paths:
    U   php/php-src/branches/PHP_5_2/ext/xml/xml.c
    U   php/php-src/branches/PHP_5_3/ext/xml/xml.c
    U   php/php-src/trunk/ext/xml/xml.c

Modified: php/php-src/branches/PHP_5_2/ext/xml/xml.c
===================================================================
--- php/php-src/branches/PHP_5_2/ext/xml/xml.c  2009-08-27 04:48:24 UTC (rev 
287789)
+++ php/php-src/branches/PHP_5_2/ext/xml/xml.c  2009-08-27 05:05:42 UTC (rev 
287790)
@@ -559,7 +559,7 @@
 {
        int pos = len;
        char *newbuf = emalloc(len + 1);
-       unsigned short c;
+       unsigned int c;
        char (*decoder)(unsigned short) = NULL;
        xml_encoding *enc = xml_get_encoding(encoding);


Modified: php/php-src/branches/PHP_5_3/ext/xml/xml.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/xml/xml.c  2009-08-27 04:48:24 UTC (rev 
287789)
+++ php/php-src/branches/PHP_5_3/ext/xml/xml.c  2009-08-27 05:05:42 UTC (rev 
287790)
@@ -664,7 +664,7 @@
 {
        int pos = len;
        char *newbuf = emalloc(len + 1);
-       unsigned short c;
+       unsigned int c;
        char (*decoder)(unsigned short) = NULL;
        xml_encoding *enc = xml_get_encoding(encoding);


Modified: php/php-src/trunk/ext/xml/xml.c
===================================================================
--- php/php-src/trunk/ext/xml/xml.c     2009-08-27 04:48:24 UTC (rev 287789)
+++ php/php-src/trunk/ext/xml/xml.c     2009-08-27 05:05:42 UTC (rev 287790)
@@ -667,7 +667,7 @@
 {
        int pos = len;
        char *newbuf = emalloc(len + 1);
-       unsigned short c;
+       unsigned int c;
        char (*decoder)(unsigned short) = NULL;
        xml_encoding *enc = NULL;


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to