opensource/HeidiSQL
1
0
Fork 0
mirror of https://github.com/HeidiSQL/HeidiSQL.git synced 2025-08-26 03:01:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Avoid AV in StrToFloat when strings with multiple commas are passed to MakeFloat. Fixes issue #1217: Trying to change sql_mode variable gives a floating point error

Browse Source
This commit is contained in:
Ansgar Becker
2009-06-11 06:41:47 +00:00
parent ef14ba7cff
commit 1b8301c64e
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/helpers.pas
View File

@ -1484,8 +1484,10 @@ var
i : Integer;
StrNumber : String;
p_kb, p_mb, p_gb, p_tb, p_pb : Integer;
HasDecimalSep: Boolean;
begin
StrNumber := '';
HasDecimalSep := False;
for i:=1 to Length(Str) do
begin
if (Str[i] in ['0'..'9', DecimalSeparator]) or ((Str[i] = '-') and (StrNumber='')) then
@ -1493,6 +1495,11 @@ begin
// Avoid confusion and AV in StrToFloat()
if (ThousandSeparator = DecimalSeparator) and (Str[i] = DecimalSeparator) then
continue;
// Ensure only 1 decimalseparator is left
if (Str[i] = DecimalSeparator) and HasDecimalSep then
continue;
if Str[i] = DecimalSeparator then
HasDecimalSep := True;
StrNumber := StrNumber + Str[i];
end;
end;