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

Fix access violation when using ASCIIencoding, by turning it from a SingleTon into a new instance each time we call GetEncodingByName. Probably introduces a memory leak. The encoding object is freed when using in a TStringStream context which is freed after usage. See exportgrid unit.

Browse Source
This commit is contained in:
Ansgar Becker
2012-11-17 08:48:21 +00:00
parent 5958d7102b
commit b6a18114f4
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/helpers.pas
View File

@ -327,7 +327,6 @@ type
var var
AppSettings: TAppSettings; AppSettings: TAppSettings;
MutexHandle: THandle = 0; MutexHandle: THandle = 0;
ASCIIEncoding: TEncoding;
implementation implementation
@ -2449,7 +2448,7 @@ begin
Result := ''; Result := '';
if Encoding = TEncoding.Default then if Encoding = TEncoding.Default then
Result := 'Windows-'+IntToStr(GetACP) Result := 'Windows-'+IntToStr(GetACP)
else if Encoding = ASCIIEncoding then else if Encoding.CodePage = 437 then
Result := 'ascii' Result := 'ascii'
else if Encoding = TEncoding.Unicode then else if Encoding = TEncoding.Unicode then
Result := 'utf-16le' Result := 'utf-16le'

9
source/main.pas
View File

@ -1580,7 +1580,6 @@ begin
FTreeRefreshInProgress := False; FTreeRefreshInProgress := False;
FileEncodings := Explode(',', 'Auto detect (may fail),ANSI,ASCII,Unicode,Unicode Big Endian,UTF-8,UTF-7'); FileEncodings := Explode(',', 'Auto detect (may fail),ANSI,ASCII,Unicode,Unicode Big Endian,UTF-8,UTF-7');
ASCIIEncoding := TEncoding.GetEncoding(437);
end; end;
@ -10118,11 +10117,13 @@ end;
function TMainForm.GetEncodingByName(Name: String): TEncoding; function TMainForm.GetEncodingByName(Name: String): TEncoding;
var
Enc: TEncoding;
begin begin
Result := nil; Result := nil;
case FileEncodings.IndexOf(Name) of case FileEncodings.IndexOf(Name) of
1: Result := TEncoding.Default; 1: Result := TEncoding.Default;
2: Result := ASCIIEncoding; 2: Result := TEncoding.GetEncoding(437);
3: Result := TEncoding.Unicode; 3: Result := TEncoding.Unicode;
4: Result := TEncoding.BigEndianUnicode; 4: Result := TEncoding.BigEndianUnicode;
5: Result := TEncoding.UTF8; 5: Result := TEncoding.UTF8;
@ -10136,7 +10137,7 @@ var
idx: Integer; idx: Integer;
begin begin
if Encoding = TEncoding.Default then idx := 1 if Encoding = TEncoding.Default then idx := 1
else if Encoding = ASCIIEncoding then idx := 2 else if Encoding.CodePage = 437 then idx := 2
else if Encoding = TEncoding.Unicode then idx := 3 else if Encoding = TEncoding.Unicode then idx := 3
else if Encoding = TEncoding.BigEndianUnicode then idx := 4 else if Encoding = TEncoding.BigEndianUnicode then idx := 4
else if Encoding = TEncoding.UTF8 then idx := 5 else if Encoding = TEncoding.UTF8 then idx := 5
@ -10201,7 +10202,7 @@ begin
54936: Result := 'gb18030'; 54936: Result := 'gb18030';
65001: Result := 'utf8'; 65001: Result := 'utf8';
end; end;
end else if Encoding = ASCIIEncoding then end else if Encoding.CodePage = 437 then
Result := 'ascii' Result := 'ascii'
else if Encoding = TEncoding.Unicode then else if Encoding = TEncoding.Unicode then
Result := 'utf16le' Result := 'utf16le'