]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorNikita Popov <nikita.ppv@gmail.com>
Thu, 20 Jun 2019 14:24:31 +0000 (16:24 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Thu, 20 Jun 2019 14:24:31 +0000 (16:24 +0200)
1  2 
Zend/zend_execute.c
Zend/zend_execute_API.c
Zend/zend_globals.h
Zend/zend_operators.c
Zend/zend_operators.h
configure.ac
ext/ffi/ffi.c
ext/soap/soap.c
ext/standard/dns.c
ext/standard/string.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc configure.ac
Simple merge
diff --cc ext/ffi/ffi.c
Simple merge
diff --cc ext/soap/soap.c
Simple merge
Simple merge
index 5c56bb4f62a86f30a234714ab282b3200f4a97a0,78b726c87ff937a568ca03821d36a00fc1674be8..bf2891c6909002099e509702afdb0019f3e8a77a
@@@ -2057,12 -2193,14 +2057,12 @@@ PHP_FUNCTION(strripos
                                php_error_docref(NULL, E_WARNING, "Offset is greater than the length of haystack string");
                                RETURN_FALSE;
                        }
-                       e = ZSTR_VAL(haystack) + ZSTR_LEN(haystack) + (size_t)offset;
+                       e = ZSTR_VAL(haystack) + (ZSTR_LEN(haystack) + (size_t)offset);
                }
                /* Borrow that ord_needle buffer to avoid repeatedly tolower()ing needle */
 -              *ZSTR_VAL(ord_needle) = tolower(*ZSTR_VAL(needle));
 +              lowered = tolower(*ZSTR_VAL(needle));
                while (e >= p) {
 -                      if (tolower(*e) == *ZSTR_VAL(ord_needle)) {
 -                              ZSTR_ALLOCA_FREE(ord_needle, use_heap);
 +                      if (tolower(*e) == lowered) {
                                RETURN_LONG(e - p + (offset > 0 ? offset : 0));
                        }
                        e--;