]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' into PHP-7.0
authorXinchen Hui <laruence@gmail.com>
Thu, 10 Mar 2016 07:23:40 +0000 (15:23 +0800)
committerXinchen Hui <laruence@gmail.com>
Thu, 10 Mar 2016 07:23:40 +0000 (15:23 +0800)
* PHP-5.6:
  Fixed typo (partially fix for #71753)

Conflicts:
ext/standard/uuencode.c

1  2 
ext/standard/uuencode.c

index b2eea1f76bb226377bfb3bf4766423cf8b745004,cd35c288ee87bd642c067170915f9cdba62ecb86..e443337ec4240253ce44e7a601677a9a10f51011
@@@ -173,8 -168,7 +173,8 @@@ PHPAPI zend_string *php_uudecode(char *
                s++;
        }
  
 -      if ((len = total_len) > (p - *dest)) {
 +      assert(p >= ZSTR_VAL(dest));
-       if ((len = total_len > (size_t)(p - ZSTR_VAL(dest)))) {
++      if ((len = total_len) > (size_t)(p - ZSTR_VAL(dest))) {
                *p++ = PHP_UU_DEC(*s) << 2 | PHP_UU_DEC(*(s + 1)) >> 4;
                if (len > 1) {
                        *p++ = PHP_UU_DEC(*(s + 1)) << 4 | PHP_UU_DEC(*(s + 2)) >> 2;