From: Xinchen Hui <laruence@gmail.com>
Date: Thu, 10 Mar 2016 07:23:40 +0000 (+0800)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.0.5RC1~10^2~12
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=351201bc7b246f0ce793307113c598db5864fdd7;p=php

Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Fixed typo (partially fix for #71753)

Conflicts:
	ext/standard/uuencode.c
---

351201bc7b246f0ce793307113c598db5864fdd7
diff --cc ext/standard/uuencode.c
index b2eea1f76b,cd35c288ee..e443337ec4
--- a/ext/standard/uuencode.c
+++ b/ext/standard/uuencode.c
@@@ -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;