Fixed overflow detection in new StrToInt overload + updated test

Author: EricGrange

Source/dwsUtils.pas

@@ -2006,41 +2006,47 @@ function TryStrToIntBase(const s : UnicodeString; base : Integer; var value : In
 
    p := Pointer(s);
 
-   neg := False;
-   case p^ of
-      '+' : Inc(p);
-      '-' : begin
-         neg := True;
-         Inc(p);
-      end;
-      '0' : begin
-         while p[1] = '0' do
+   try
+      neg := False;
+      case p^ of
+         '+' : Inc(p);
+         '-' : begin
+            neg := True;
             Inc(p);
+         end;
+         '0' : begin
+            while p[1] = '0' do
+               Inc(p);
+         end;
       end;
-   end;
 
-   temp := 0;
+      temp := 0;
 
-   while True do begin
-      case p^ of
-         #0 : Break;
-         '0'..'9' : d := Ord(p^) - Ord('0');
-         'a'..'z' : d := Ord(p^) + (10 - Ord('a'));
-         'A'..'Z' : d := Ord(p^) + (10 - Ord('A'));
-      else
-         Exit;
+      while True do begin
+         case p^ of
+            #0 : Break;
+            '0'..'9' : d := Ord(p^) - Ord('0');
+            'a'..'z' : d := Ord(p^) + (10 - Ord('a'));
+            'A'..'Z' : d := Ord(p^) + (10 - Ord('A'));
+         else
+            Exit;
+         end;
+         if d >= base then
+            Exit;
+{$Q+}
+         temp := temp * base + d;
+{$Q-}
+         Inc(p);
       end;
-      if d >= base then
-         Exit;
-      temp := temp * base + d;
-      if temp < 0 then
-         exit;
-      Inc(p);
+      if neg then
+         value := -temp
+      else value := temp;
+      Result := True;
+   except
+      on E: EIntOverflow do
+         Exit(False);
+      else raise;
    end;
-   if neg then
-      value := -temp
-   else value := temp;
-   Result := True;
 end;
 
 // FastStringReplace

Test/FunctionsString/strtoint_base.pas

@@ -40,3 +40,10 @@
 except
    on E: Exception do PrintLn(E.Message);
 end;
+
+try
+   PrintLn(StrToInt('4444444444444444', base+6));
+   PrintLn(StrToInt('44444444444444444', base+6));
+except
+   on E: Exception do PrintLn(E.Message);
+end;

Test/FunctionsString/strtoint_base.txt

@@ -41,3 +41,5 @@ Invalid base for string to integer conversion (1) [line: 18, column: 12]
 9223372036854775807
 -9223372036854775807
 "zzzZzzzZzzzzzz" is not a valid 64bit integer value in base 36 [line: 39, column: 12]
+4919131752989213764
+"44444444444444444" is not a valid 64bit integer value in base 16 [line: 46, column: 12]