rasmus          Tue Jan 29 23:21:11 2008 UTC

  Added files:                 (Branch: PHP_5_3)
    /php-src/ext/xml/tests      bug43957.phpt 

  Modified files:              
    /php-src/ext/xml    xml.c 
  Log:
  Fixed bug #43957 (utf8_decode() bogus conversion of partial multibyte UTF8 
char)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/xml/xml.c?r1=1.157.2.4.2.5.2.2&r2=1.157.2.4.2.5.2.3&diff_format=u
Index: php-src/ext/xml/xml.c
diff -u php-src/ext/xml/xml.c:1.157.2.4.2.5.2.2 
php-src/ext/xml/xml.c:1.157.2.4.2.5.2.3
--- php-src/ext/xml/xml.c:1.157.2.4.2.5.2.2     Mon Dec 31 07:17:16 2007
+++ php-src/ext/xml/xml.c       Tue Jan 29 23:21:10 2008
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: xml.c,v 1.157.2.4.2.5.2.2 2007/12/31 07:17:16 sebastian Exp $ */
+/* $Id: xml.c,v 1.157.2.4.2.5.2.3 2008/01/29 23:21:10 rasmus Exp $ */
 
 #define IS_EXT_MODULE
 
@@ -579,15 +579,27 @@
        while (pos > 0) {
                c = (unsigned char)(*s);
                if (c >= 0xf0) { /* four bytes encoded, 21 bits */
-                       c = ((s[0]&7)<<18) | ((s[1]&63)<<12) | ((s[2]&63)<<6) | 
(s[3]&63);
+                       if(pos-4 >= 0) {
+                               c = ((s[0]&7)<<18) | ((s[1]&63)<<12) | 
((s[2]&63)<<6) | (s[3]&63);
+                       } else {
+                               c = '?';        
+                       }
                        s += 4;
                        pos -= 4;
                } else if (c >= 0xe0) { /* three bytes encoded, 16 bits */
-                       c = ((s[0]&63)<<12) | ((s[1]&63)<<6) | (s[2]&63);
+                       if(pos-3 >= 0) {
+                               c = ((s[0]&63)<<12) | ((s[1]&63)<<6) | 
(s[2]&63);
+                       } else {
+                               c = '?';
+                       }
                        s += 3;
                        pos -= 3;
                } else if (c >= 0xc0) { /* two bytes encoded, 11 bits */
-                       c = ((s[0]&63)<<6) | (s[1]&63);
+                       if(pos-3 >= 0) {
+                               c = ((s[0]&63)<<6) | (s[1]&63);
+                       } else {
+                               c = '?';
+                       }
                        s += 2;
                        pos -= 2;
                } else {

http://cvs.php.net/viewvc.cgi/php-src/ext/xml/tests/bug43957.phpt?view=markup&rev=1.1
Index: php-src/ext/xml/tests/bug43957.phpt
+++ php-src/ext/xml/tests/bug43957.phpt

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

Reply via email to