Add consistency check

defuse/php-encryption#189
paragonie · Apr 3, 2016 · 1115ffa · 1115ffa
1 parent c7e26a2
commit 1115ffa
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/lib/byte_safe_strings.php b/lib/byte_safe_strings.php
@@ -125,6 +125,14 @@ function RandomCompat_substr($binary_string, $start, $length = null)
                 );
             }
 
+            // Consistency with PHP's behavior
+            if ($start === RandomCompat_strlen($binary_string) && $length === 0) {
+                return '';
+            }
+            if ($start > RandomCompat_strlen($binary_string)) {
+                return false;
+            }
+
             return mb_substr($binary_string, $start, $length, '8bit');
         }