summaryrefslogtreecommitdiff
path: root/ext/standard/strnatcmp.c
diff options
context:
space:
mode:
Diffstat (limited to 'ext/standard/strnatcmp.c')
-rw-r--r--ext/standard/strnatcmp.c21
1 files changed, 19 insertions, 2 deletions
diff --git a/ext/standard/strnatcmp.c b/ext/standard/strnatcmp.c
index face191a6e..7b3826b5be 100644
--- a/ext/standard/strnatcmp.c
+++ b/ext/standard/strnatcmp.c
@@ -108,8 +108,25 @@ PHPAPI int strnatcmp_ex(char const *a, size_t a_len, char const *b, size_t b_len
int fractional, result;
short leading = 1;
- if (a_len == 0 || b_len == 0)
- return a_len - b_len;
+ 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;
+ }
ap = a;
bp = b;