diff options
| author | Stanislav Malyshev <stas@php.net> | 2016-08-16 16:03:44 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2016-08-16 22:55:43 -0700 |
| commit | 35a8ed2f6283d0dd09009e1f1ab18d66bdff5e42 (patch) | |
| tree | 04681a2e2e5cd4de6f9f646925cad62b67307ef1 | |
| parent | b9e81e58440b9b5c07bf5435baef5531b2b318a0 (diff) | |
| download | php-git-35a8ed2f6283d0dd09009e1f1ab18d66bdff5e42.tar.gz | |
Fix bug #72850 - integer overflow in uuencode
| -rw-r--r-- | ext/standard/uuencode.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/ext/standard/uuencode.c b/ext/standard/uuencode.c index cd35c288ee..a31f14d824 100644 --- a/ext/standard/uuencode.c +++ b/ext/standard/uuencode.c @@ -153,7 +153,7 @@ PHPAPI int php_uudecode(char *src, int src_len, char **dest) /* {{{ */ while (s < ee) { if(s+4 > e) { goto err; - } + } *p++ = PHP_UU_DEC(*s) << 2 | PHP_UU_DEC(*(s + 1)) >> 4; *p++ = PHP_UU_DEC(*(s + 1)) << 4 | PHP_UU_DEC(*(s + 2)) >> 2; *p++ = PHP_UU_DEC(*(s + 2)) << 6 | PHP_UU_DEC(*(s + 3)); @@ -188,7 +188,7 @@ err: } /* }}} */ -/* {{{ proto string convert_uuencode(string data) +/* {{{ proto string convert_uuencode(string data) uuencode a string */ PHP_FUNCTION(convert_uuencode) { @@ -200,6 +200,11 @@ PHP_FUNCTION(convert_uuencode) } dst_len = php_uuencode(src, src_len, &dst); + if (dst_len < 0) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "String too long, max length is %d", INT_MAX); + efree(dst); + RETURN_FALSE; + } RETURN_STRINGL(dst, dst_len, 0); } |