substr() fix

diff --git a/ext/standard/string.c b/ext/standard/string.c
index 012de6a6115d9b88781adb191fc4f0acfa28bdc6..e1880c93b63713ee5653de3c9cd248ff108c8a56 100644 (file)
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -826,9 +826,10 @@ void php3_substr(INTERNAL_FUNCTION_PARAMETERS)
                RETURN_FALSE;
        }
 
-       if ((f + l) < (int)string->value.str.len) {
-               string->value.str.val[f + l] = '\0';
+       if((f+l) > (int)string->value.str.len) {
+               l = (int)string->value.str.len - f;
        }
+
        RETVAL_STRINGL(string->value.str.val + f, l, 1);
 }
 /* }}} */