clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-24 11:27:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Rui Hirokawa 2005-12-23 11:14:54 +00:00
parent b863d32288
commit 283f4759f6
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ext/mbstring/mbstring.c
View File

@ -60,7 +60,6 @@
#include "ext/standard/url.h"
#include "main/php_output.h"
#include "ext/standard/info.h"
#include "libmbfl/mbfl/mbfl_allocators.h"
#include "php_variables.h"
@ -1763,6 +1762,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 */