MFH: fixed #28899 mb_substr() and substr() work differently when mbstring.func_overload is enabled.

Rui Hirokawa · Rui Hirokawa · commit 82fc47e1f67d · 2005-12-23T11:15:32.000Z
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
@@ -1736,6 +1736,11 @@ PHP_FUNCTION(mb_substr)
 		}
 	}
 
+	if (((MBSTRG(func_overload) & MB_OVERLOAD_STRING) == MB_OVERLOAD_STRING)
+		&& (from >= mbfl_strlen(&string))) {
+		RETURN_FALSE;
+	}
+
 	ret = mbfl_substr(&string, &result, from, len);
 	if (ret != NULL) {
 		RETVAL_STRINGL((char *)ret->val, ret->len, 0);		/* the string is already strdup()'ed */

Original file line number	Diff line number	Diff line change
`@@ -1736,6 +1736,11 @@ PHP_FUNCTION(mb_substr)`
`1736`	`1736`	`}`
`1737`	`1737`	`}`
`1738`	`1738`
	`1739`	`+ if (((MBSTRG(func_overload) & MB_OVERLOAD_STRING) == MB_OVERLOAD_STRING)`
	`1740`	`+ && (from >= mbfl_strlen(&string))) {`
	`1741`	`+ RETURN_FALSE;`
	`1742`	`+ }`
	`1743`	`+`
`1739`	`1744`	`ret = mbfl_substr(&string, &result, from, len);`
`1740`	`1745`	`if (ret != NULL) {`
`1741`	`1746`	`RETVAL_STRINGL((char )ret->val, ret->len, 0); / the string is already strdup()'ed */`