From: Rasmus Lerdorf <rasmus@php.net>
Date: Wed, 12 May 1999 12:53:45 +0000 (+0000)
Subject: substr() fix
X-Git-Tag: BEFORE_PHP4_APACHE_MODULE_CHANGE~56
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fbeeb8f29c09c9c434f82a845ed11806da024852;p=php

substr() fix
---

diff --git a/ext/standard/string.c b/ext/standard/string.c
index 012de6a611..e1880c93b6 100644
--- 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);
 }
 /* }}} */