diff options
| author | Anatol Belski <ab@php.net> | 2014-09-15 12:54:46 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-09-15 12:58:46 +0200 |
| commit | 172ca172d135fc3ade5a08b5b3ef8cedcdc5018d (patch) | |
| tree | 3f7823ec6fe5963c80c68a0ace0323020b139ea4 /ext | |
| parent | 836fd73cce8d0550baf5477bfb0ea0edbfae455a (diff) | |
| download | php-git-172ca172d135fc3ade5a08b5b3ef8cedcdc5018d.tar.gz | |
correct fix to the natcmp_ex
Till now the actualy length diff between the strings was under
circumstances returned. Whereby for a compare function only return
values of (1, 0, -1) make sense. Thus the old behavior isn't
present anymore, natcmp_ex now behaves as a standard compare function.
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/standard/strnatcmp.c | 18 | ||||
| -rw-r--r-- | ext/standard/tests/strings/strnatcasecmp_variation1.phpt | 4 |
2 files changed, 3 insertions, 19 deletions
diff --git a/ext/standard/strnatcmp.c b/ext/standard/strnatcmp.c index 7b3826b5be..de6f727343 100644 --- a/ext/standard/strnatcmp.c +++ b/ext/standard/strnatcmp.c @@ -109,23 +109,7 @@ PHPAPI int strnatcmp_ex(char const *a, size_t a_len, char const *b, size_t b_len short leading = 1; if (a_len == 0 || b_len == 0) { - result = 0; - - if (a_len > b_len) { - if (a_len - b_len <= INT_MAX) { - result = (int)(a_len - b_len); - } else { - result = 1; - } - } else { - if (b_len - a_len <= (size_t)(-INT_MIN)) { - result = -(int)(b_len - a_len); - } else { - result = -1; - } - } - - return result; + return (a_len == b_len ? 0 : (a_len > b_len ? 1 : -1)); } ap = a; diff --git a/ext/standard/tests/strings/strnatcasecmp_variation1.phpt b/ext/standard/tests/strings/strnatcasecmp_variation1.phpt index fb0fb79ae5..e74f6b73e9 100644 --- a/ext/standard/tests/strings/strnatcasecmp_variation1.phpt +++ b/ext/standard/tests/strings/strnatcasecmp_variation1.phpt @@ -48,8 +48,8 @@ str_dump($a, $b); --EXPECT-- *** Testing strnatcasecmp() : variation *** int(1) -int(6) -int(-2) +int(1) +int(-1) int(-1) int(0) int(0) |