diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2015-05-15 22:45:35 +0200 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2015-05-15 22:45:35 +0200 |
| commit | 34e6fbbfed6bd63e7f71ca61ff73ca67d0c12b7b (patch) | |
| tree | f9c20aa7c8a55c9670ee4d456e895679c80fb45e /ext/gettext | |
| parent | 6868b56e25e6ce80418219bd876ee2de7646cf63 (diff) | |
| parent | 230b435ed40fe40931ae3f32f319cfff328ac2fe (diff) | |
| download | php-git-34e6fbbfed6bd63e7f71ca61ff73ca67d0c12b7b.tar.gz | |
Merge branch 'master' of https://github.com/php/php-src
Diffstat (limited to 'ext/gettext')
| -rw-r--r-- | ext/gettext/gettext.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/gettext/gettext.c b/ext/gettext/gettext.c index 90038fad5c..44502729e5 100644 --- a/ext/gettext/gettext.c +++ b/ext/gettext/gettext.c @@ -139,13 +139,13 @@ ZEND_GET_MODULE(php_gettext) #define PHP_GETTEXT_MAX_MSGID_LENGTH 4096 #define PHP_GETTEXT_DOMAIN_LENGTH_CHECK \ - if (domain_len > PHP_GETTEXT_MAX_DOMAIN_LENGTH) { \ + if (UNEXPECTED(domain_len > PHP_GETTEXT_MAX_DOMAIN_LENGTH)) { \ php_error_docref(NULL, E_WARNING, "domain passed too long"); \ RETURN_FALSE; \ } #define PHP_GETTEXT_LENGTH_CHECK(check_name, check_len) \ - if (check_len > PHP_GETTEXT_MAX_MSGID_LENGTH) { \ + if (UNEXPECTED(check_len > PHP_GETTEXT_MAX_MSGID_LENGTH)) { \ php_error_docref(NULL, E_WARNING, "%s passed too long", check_name); \ RETURN_FALSE; \ } |