com php-src: Fixed bug #72658 Locale::lookup() / locale_looku p() hangs if no match found: ext/intl/locale/ locale_methods.c
ext/intl/tests/locale_bug7265 8.phpt
| From: | Anatol Belski | Date: | Mon, 25 Jul 2016 10:49:13 +0000 |
| Subject: | com php-src: Fixed bug #72658 Locale::lookup() / locale_looku p() hangs if no match found: ext/intl/locale/ locale_methods.c ext/intl/tests/locale_bug7265 8.phpt |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-93385@lists.php.net to get a copy of this message | ||
Commit: bd9a5b183c45604471467f894b7032bea2190982
Author: Anatol Belski <ab@php.net> Mon, 25 Jul 2016 12:47:48 +0200
Parents: ee07e23e8e217013392f479f50fa1ac1686304b6
Branches: PHP-7.1 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=bd9a5b183c45604471467f894b7032bea2190982
Log:
Fixed bug #72658 Locale::lookup() / locale_lookup() hangs if no match found
Bugs:
https://bugs.php.net/72658
Changed paths:
M ext/intl/locale/locale_methods.c
A ext/intl/tests/locale_bug72658.phpt
Diff:
diff --git a/ext/intl/locale/locale_methods.c b/ext/intl/locale/locale_methods.c
index c91287c..5a0c715 100644
--- a/ext/intl/locale/locale_methods.c
+++ b/ext/intl/locale/locale_methods.c
@@ -145,10 +145,10 @@ static char* getPreferredTag(const char* gf_tag)
* or -1 if no token
* strtokr equivalent search for token in reverse direction
*/
-static int getStrrtokenPos(char* str, int savedPos)
+static zend_off_t getStrrtokenPos(char* str, zend_off_t savedPos)
{
- int result =-1;
- int i;
+ zend_off_t result =-1;
+ zend_off_t i;
for(i=savedPos-1; i>=0; i--) {
if(isIDSeparator(*(str+i)) ){
@@ -1429,7 +1429,7 @@ static zend_string* lookup_loc_range(const char* loc_range, HashTable*
hash_arr,
char* cur_loc_range = NULL;
zend_string* can_loc_range = NULL;
- size_t saved_pos = 0;
+ zend_off_t saved_pos = 0;
zend_string* return_value = NULL;
diff --git a/ext/intl/tests/locale_bug72658.phpt b/ext/intl/tests/locale_bug72658.phpt
new file mode 100644
index 0000000..877f0b2
--- /dev/null
+++ b/ext/intl/tests/locale_bug72658.phpt
@@ -0,0 +1,18 @@
+--TEST--
+Bug #72658 Locale::lookup() / locale_lookup() hangs if no match found
+--SKIPIF--
+<?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
+--FILE--
+<?php
+
+var_dump(
+ Locale::lookup(['en-Latn-US', 'sl', 'sl-IT'], 'en-US',
true, 'de-DE'),
+ Locale::lookup(['en-Latn-US', 'sl', 'sl-IT'], 'en-US',
false, 'de-DE')
+);
+
+?>
+==DONE==
+--EXPECT--
+string(5) "de-DE"
+string(5) "de-DE"
+==DONE==