FpDebug: fix accessing nil fileloader. Introduced in rev 59729 #f09614b9a8 / Issue #0034657

git-svn-id: trunk@59745 -
This commit is contained in:
martin 2018-12-06 23:37:45 +00:00
parent 4286d5a275
commit c5fdbd440a

View File

@ -196,7 +196,7 @@ constructor TDbgImageLoader.Create(AFileName: String; ADebugMap: TObject = nil);
begin
FFileName := AFileName;
FFileLoader := TDbgFileLoader.Create(AFileName);
FImgReader := GetImageReader(FFileLoader, ADebugMap, True);
FImgReader := GetImageReader(FFileLoader, ADebugMap, False);
if FImgReader = nil then FreeAndNil(FFileLoader);
end;
@ -210,7 +210,7 @@ end;
constructor TDbgImageLoader.Create(AFileHandle: THandle; ADebugMap: TObject = nil);
begin
FFileLoader := TDbgFileLoader.Create(AFileHandle);
FImgReader := GetImageReader(FFileLoader, ADebugMap, True);
FImgReader := GetImageReader(FFileLoader, ADebugMap, False);
if FImgReader = nil then FreeAndNil(FFileLoader);
end;
{$endif}
@ -218,12 +218,14 @@ end;
destructor TDbgImageLoader.Destroy;
begin
FreeAndNil(FImgReader);
FreeAndNil(FFileLoader);
inherited Destroy;
end;
procedure TDbgImageLoader.CloseFileLoader;
begin
FFileLoader.Close;
if FFileLoader <> nil then
FFileLoader.Close;
end;
procedure TDbgImageLoader.AddToLoaderList(ALoaderList: TDbgImageLoaderList);