cvs: php-src /ext/intl/locale locale_methods.c
| From: | Felipe Pena | Date: | Wed, 30 Jul 2008 17:56:18 +0000 |
| Subject: | cvs: php-src /ext/intl/locale locale_methods.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-51777@lists.php.net to get a copy of this message | ||
felipe Wed Jul 30 17:56:18 2008 UTC
Modified files:
/php-src/ext/intl/locale locale_methods.c
Log:
- MFB: Fixed crash when NULL is passed to locale_accept_from_http()
http://cvs.php.net/viewvc.cgi/php-src/ext/intl/locale/locale_methods.c?r1=1.6&r2=1.7&diff_format=u
Index: php-src/ext/intl/locale/locale_methods.c
diff -u php-src/ext/intl/locale/locale_methods.c:1.6 php-src/ext/intl/locale/locale_methods.c:1.7
--- php-src/ext/intl/locale/locale_methods.c:1.6 Mon Jul 28 09:01:03 2008
+++ php-src/ext/intl/locale/locale_methods.c Wed Jul 30 17:56:18 2008
@@ -1692,7 +1692,7 @@
&outResult, http_accept, available, &status);
uenum_close(available);
INTL_CHECK_STATUS(status, "locale_accept_from_http: failed to find
acceptable locale");
- if(outResult == ULOC_ACCEPT_FAILED) {
+ if(len < 0 || outResult == ULOC_ACCEPT_FAILED) {
RETURN_FALSE;
}
RETURN_STRINGL(resultLocale, len, 1);