paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-13 10:59:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

* GetModuleByAddr: Prevent returning a name of the current executable for invalid addresses such as pointer(-1) on Windows.

Browse Source 
git-svn-id: trunk@43364 -
This commit is contained in:
yury 2019-11-02 14:54:25 +00:00
parent 6f80223b64
commit 4ade471488
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
rtl/inc/exeinfo.pp
View File

@ -98,12 +98,15 @@ uses
begin begin
baseaddr:=Tmm.AllocationBase; baseaddr:=Tmm.AllocationBase;
TST[0]:= #0; TST[0]:= #0;
GetModuleFileName(THandle(Tmm.AllocationBase), TST, Length(TST)); if baseaddr <> nil then
begin
GetModuleFileName(THandle(Tmm.AllocationBase), TST, Length(TST));
{$ifdef FPC_OS_UNICODE} {$ifdef FPC_OS_UNICODE}
filename:= String(PWideChar(@TST)); filename:= String(PWideChar(@TST));
{$else} {$else}
filename:= String(PChar(@TST)); filename:= String(PChar(@TST));
{$endif FPC_OS_UNICODE} {$endif FPC_OS_UNICODE}
end;
end; end;
end; end;