diff options
| author | Xinchen Hui <laruence@gmail.com> | 2016-03-10 15:23:40 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2016-03-10 15:23:40 +0800 |
| commit | 351201bc7b246f0ce793307113c598db5864fdd7 (patch) | |
| tree | 85c623ed5ce0f71d5018fd7ffee2f3c9c4822bec | |
| parent | c3cf6f2a682eb25d0a52bef77386f155115efc13 (diff) | |
| parent | 915a3762ef71526d6deddf95bf42a6d5bf5211f3 (diff) | |
| download | php-git-351201bc7b246f0ce793307113c598db5864fdd7.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fixed typo (partially fix for #71753)
Conflicts:
ext/standard/uuencode.c
| -rw-r--r-- | ext/standard/uuencode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/uuencode.c b/ext/standard/uuencode.c index b2eea1f76b..e443337ec4 100644 --- a/ext/standard/uuencode.c +++ b/ext/standard/uuencode.c @@ -174,7 +174,7 @@ PHPAPI zend_string *php_uudecode(char *src, size_t src_len) /* {{{ */ } 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; |