Fixed limit warnings in non-unicode mode

diff --git a/ext/standard/string.c b/ext/standard/string.c
index 718a64b2ef430688eadea97255a3ea9ab19e79b5..bc666cc1920b5e6d79f8656e56c6c3fd412c157f 100644 (file)
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -2788,6 +2788,7 @@ PHP_FUNCTION(strrpos)
                if (offset >= 0) {
                        U16_FWD_N(haystack.u, cu_offset, haystack_len, offset);
                        if (cu_offset > haystack_len - needle_len) {
+                               php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Offset is greater than the length of haystack string");
                                RETURN_FALSE;
                        }
                        u_p = haystack.u + cu_offset;
@@ -2795,11 +2796,13 @@ PHP_FUNCTION(strrpos)
                } else {
                        u_p = haystack.u;
                        if (-offset > haystack_len) {
+                               php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Offset is greater than the length of haystack string");
                                RETURN_FALSE;
                        } else {
                                cu_offset = haystack_len;
                                U16_BACK_N(haystack.u, 0, cu_offset, -offset);
                                if (cu_offset == 0) {
+                                       php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Offset is greater than the length of haystack string");
                                        RETURN_FALSE;
                                }
                                if (needle_len > haystack_len - cu_offset) {
@@ -2823,12 +2826,14 @@ PHP_FUNCTION(strrpos)
        } else {
                if (offset >= 0) {
                        if (offset > haystack_len) {
+                               php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Offset is greater than the length of haystack string");
                                RETURN_FALSE;
                        }
                        p = haystack.s + offset;
                        e = haystack.s + haystack_len - needle_len;
                } else {
                        if (-offset > haystack_len) {
+                               php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Offset is greater than the length of haystack string");
                                RETURN_FALSE;
                        }
 
@@ -2913,6 +2918,7 @@ PHP_FUNCTION(strripos)
                if (offset >= 0) {
                        U16_FWD_N(haystack.u, cu_offset, haystack_len, offset);
                        if (cu_offset > haystack_len - needle_len) {
+                               php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Offset is greater than the length of haystack string");
                                RETURN_FALSE;
                        }
                        u_p = haystack.u + cu_offset;
@@ -2920,11 +2926,13 @@ PHP_FUNCTION(strripos)
                } else {
                        u_p = haystack.u;
                        if (-offset > haystack_len || offset < -INT_MAX) {
+                               php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Offset is greater than the length of haystack string");
                                RETURN_FALSE;
                        } else {
                                cu_offset = haystack_len;
                                U16_BACK_N(haystack.u, 0, cu_offset, -offset);
                                if (cu_offset == 0) {
+                                       php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Offset is greater than the length of haystack string");
                                        RETURN_FALSE;
                                }
                                if (needle_len > haystack_len - cu_offset) {
@@ -2951,6 +2959,7 @@ PHP_FUNCTION(strripos)
                           Can also avoid tolower emallocs */
                        if (offset >= 0) {
                                if (offset > haystack_len) {
+                                       php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Offset is greater than the length of haystack string");
                                        RETURN_FALSE;
                                }
                                p = haystack.s + offset;
@@ -2958,6 +2967,7 @@ PHP_FUNCTION(strripos)
                        } else {
                                p = haystack.s;
                                if (-offset > haystack_len || offset < INT_MAX) {
+                                       php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Offset is greater than the length of haystack string");
                                        RETURN_FALSE;
                                } else {
                                        e = haystack.s + haystack_len + offset;
@@ -2983,6 +2993,7 @@ PHP_FUNCTION(strripos)
                        if (offset > haystack_len) {
                                efree(haystack_dup);
                                efree(needle_dup);
+                               php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Offset is greater than the length of haystack string");
                                RETURN_FALSE;
                        }
                        p = haystack_dup + offset;
@@ -2991,6 +3002,7 @@ PHP_FUNCTION(strripos)
                        if (-offset > haystack_len || offset < -INT_MAX) {
                                efree(haystack_dup);
                                efree(needle_dup);
+                               php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Offset is greater than the length of haystack string");
                                RETURN_FALSE;
                        } 
                        p = haystack_dup;
@@ -3269,9 +3281,10 @@ PHP_FUNCTION(substr)
 
 /* {{{ php_adjust_limits
  */
-PHPAPI void php_adjust_limits(zval **str, int *f, int *l)
+static int php_adjust_limits(zval **str, int *f, int *l)
 {
        int str_codepts;
+       int ret = 1;
 
        if (Z_TYPE_PP(str) == IS_UNICODE) {
                str_codepts = u_countChar32(Z_USTRVAL_PP(str), Z_USTRLEN_PP(str));
@@ -3297,9 +3310,15 @@ PHPAPI void php_adjust_limits(zval **str, int *f, int *l)
                        *l = 0;
                }
        }
+       if (*f > str_codepts || (*f < 0 && -(*f) > str_codepts)) {
+               ret = 0;
+       } else if (*l > str_codepts || (*l < 0 && -(*l) > str_codepts)) {
+               ret = 0;
+       }
        if (((unsigned)(*f) + (unsigned)(*l)) > str_codepts) {
                *l = str_codepts - *f;
        }
+       return ret;
 }
 /* }}} */
 
@@ -3436,7 +3455,9 @@ PHP_FUNCTION(substr_replace)
                                convert_to_explicit_type_ex(str, str_type);
                                convert_to_explicit_type_ex(tmp_repl, str_type);
                        }
-                       php_adjust_limits(str, &f, &l);
+                       if (!php_adjust_limits(str, &f, &l)) {
+                               RETURN_FALSE;
+                       }
                        result_len = php_do_substr_replace(&result, str, tmp_repl, f, l TSRMLS_CC);
 
                        if (Z_TYPE_PP(str) == IS_UNICODE) {

diff --git a/ext/standard/tests/strings/strripos_offset.phpt b/ext/standard/tests/strings/strripos_offset.phpt
index 0dd22cba7eace8ccda9f153c721d01e73c99afdd..e3d44ae7d5cbaadc50fc9c7f2cd3609b22f4f72b 100644 (file)
--- a/ext/standard/tests/strings/strripos_offset.phpt
+++ b/ext/standard/tests/strings/strripos_offset.phpt
@@ -16,28 +16,30 @@ var_dump(strripos(1024, "te", -PHP_INT_MAX-1));
 echo "Done\n";
 ?>
 --EXPECTF--    
-bool(false)
-bool(false)
-bool(false)
+Notice: strripos(): Offset is greater than the length of haystack string in %s on line %d
 bool(false)
 
-Warning: strripos() expects parameter 1 to be string (Unicode or binary), array given in %s on line %d
-bool(false)
-bool(false)
-bool(false)
-bool(false)
-bool(false)
-Done
---UEXPECTF--
-bool(false)
+Notice: strripos(): Offset is greater than the length of haystack string in %s on line %d
 bool(false)
+
+Notice: strripos(): Offset is greater than the length of haystack string in %s on line %d
 bool(false)
+
+Notice: strripos(): Offset is greater than the length of haystack string in %s on line %d
 bool(false)
 
 Warning: strripos() expects parameter 1 to be string (Unicode or binary), array given in %s on line %d
 bool(false)
+
+Notice: strripos(): Offset is greater than the length of haystack string in %s on line %d
 bool(false)
+
+Notice: strripos(): Offset is greater than the length of haystack string in %s on line %d
 bool(false)
+
+Notice: strripos(): Offset is greater than the length of haystack string in %s on line %d
 bool(false)
+
+Notice: strripos(): Offset is greater than the length of haystack string in %s on line %d
 bool(false)
 Done