restrict substring to string size

charleshc · May 8, 2019 · 33a32ae · 33a32ae
1 parent 01d4639
commit 33a32ae
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/Modules/StringExtensions.bas b/src/Modules/StringExtensions.bas
@@ -40,7 +40,11 @@ End Function
 
 
 Public Function Substring(ByVal text As String, startIndex As Integer, Optional length As Variant) As String
-    If IsMissing(length) Or TypeName(length) <> "Integer" Then
+    If startIndex > Len(text) Then
+        startIndex = Len(text)
+    End If
+
+    If IsMissing(length) Or TypeName(length) <> "Integer" Or length > Len(text) Then
         length = Len(text) - startIndex
     End If