Fix bug #62922

nikic · nikic · commit 257054e81d4d · 2015-06-20T14:39:55.000+02:00
Off by one error...
diff --git a/NEWS b/NEWS
@@ -30,7 +30,7 @@ PHP                                                                        NEWS
 
 - mysqlnd:
   . Fixed Bug #69796 (mysqli_stmt::fetch doesn't assign null values to
-    bound variables). (Laruence);
+    bound variables). (Laruence)
 
 - Curl:
   . Fixed bug #69831 (Segmentation fault in curl_getinfo). (im dot denisenko at
@@ -48,6 +48,10 @@ PHP                                                                        NEWS
 - SPL
   . Fixed bug #69845 (ArrayObject with ARRAY_AS_PROPS broken). (Dmitry)
 
+- Standard
+  . Fixed bug #62922 (Truncating entire string should result in string).
+    (Nikita)
+
 11 Jun 2015, PHP 7.0.0 Alpha 1
 
 - Core:
diff --git a/ext/standard/string.c b/ext/standard/string.c
@@ -2406,7 +2406,7 @@ PHP_FUNCTION(substr)
 		}
 	}
 
-	if (f >= (zend_long)str->len) {
+	if (f > (zend_long)str->len) {
 		RETURN_FALSE;
 	}
 
diff --git a/ext/standard/tests/streams/bug62922.phpt b/ext/standard/tests/streams/bug62922.phpt
@@ -0,0 +1,12 @@
+--TEST--
+Bug #62922: Truncating entire string should result in string
+--FILE--
+<?php
+var_dump(substr("", 0));
+var_dump(substr("a", 1));
+var_dump(substr("ab", 2));
+?>
+--EXPECT--
+string(0) ""
+string(0) ""
+string(0) ""
diff --git a/ext/standard/tests/strings/substr.phpt b/ext/standard/tests/strings/substr.phpt
