com php-src: fixed substr(): ext/standard/string.c
| From: | Anatol Belski | Date: | Wed, 16 Oct 2013 10:08:25 +0000 |
| Subject: | com php-src: fixed substr(): ext/standard/string.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-73490@lists.php.net to get a copy of this message | ||
Commit: c9280f1e1c59c4198c458d8e693dd0f9aa672200
Author: Anatol Belski <ab@php.net> Fri, 16 Aug 2013 08:10:14 -0700
Parents: f4c91f0aa8dd8a6ec32ac1d1f8ea011bd32b7f71
Branches: str_size_and_int64
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c9280f1e1c59c4198c458d8e693dd0f9aa672200
Log:
fixed substr()
Changed paths:
M ext/standard/string.c
Diff:
diff --git a/ext/standard/string.c b/ext/standard/string.c
index 493e8c1..75bd5f1 100644
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -2226,7 +2226,7 @@ PHP_FUNCTION(substr)
if (argc > 2) {
if ((l < 0 && -l > str_len)) {
RETURN_FALSE;
- } else if (l > str_len) {
+ } else if (l >= 0 && l > str_len) {
l = str_len;
}
} else {
@@ -2239,7 +2239,7 @@ PHP_FUNCTION(substr)
f = 0;
}
- if (l < 0 && (l + str_len - f) < 0) {
+ if (l < 0 && ((f > 0 && (l + str_len) < f) || (f < 0 &&
(l+str_len) > f))) {
RETURN_FALSE;
}