diff options
| author | Stanislav Malyshev <stas@php.net> | 2016-08-16 16:34:35 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2016-08-16 22:55:43 -0700 |
| commit | 40bd921cea0cfb96dd0a19d95ed19078d06a9988 (patch) | |
| tree | 0d62e31a4d8509c0b7c7e714c15df42379472aa0 | |
| parent | 35a8ed2f6283d0dd09009e1f1ab18d66bdff5e42 (diff) | |
| download | php-git-40bd921cea0cfb96dd0a19d95ed19078d06a9988.tar.gz | |
Fix TSRM build
| -rw-r--r-- | ext/standard/base64.c | 1 | ||||
| -rw-r--r-- | ext/standard/url.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/ext/standard/base64.c b/ext/standard/base64.c index 8340ed1260..b30a5b73b1 100644 --- a/ext/standard/base64.c +++ b/ext/standard/base64.c @@ -67,6 +67,7 @@ PHPAPI unsigned char *php_base64_encode(const unsigned char *str, int length, in } if (((size_t)length + 2) / 3 > INT_MAX/4 ) { + TSRMLS_FETCH(); php_error_docref(NULL TSRMLS_CC, E_WARNING, "String too long, maximum is %d", INT_MAX/4); return NULL; } diff --git a/ext/standard/url.c b/ext/standard/url.c index 8e471e12d8..dd861a570d 100644 --- a/ext/standard/url.c +++ b/ext/standard/url.c @@ -522,6 +522,7 @@ PHPAPI char *php_url_encode(char const *s, int len, int *new_length) } if ((to-start) > INT_MAX) { + TSRMLS_FETCH(); /* E_ERROR since most clients won't check for error, and this is rather rare condition */ php_error_docref(NULL TSRMLS_CC, E_ERROR, "String overflow, max length is %d", INT_MAX); } |