paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-26 01:09:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

FpDebug, LazDebuggerFpLldb: prevent reading invalid memory (int overflow of Addr+Size) / this fixes crashes due to incorrect cache matches

Browse Source 
git-svn-id: trunk@60338 -
This commit is contained in:
martin 2019-02-05 17:31:03 +00:00
parent 9888759176
commit f72819e5bd
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
components/fpdebug/fpdmemorytools.pas
View File

@ -645,14 +645,16 @@ end;
function TFpDbgMemCacheSimple.ContainsMemory(AnAddress: TDbgPtr; ASize: Cardinal
): Boolean;
begin
Result := (AnAddress >= FCacheAddress) or (AnAddress + ASize <= FCacheAddress + FCacheSize);
Result := (ASize <= High(TDbgPtr) - AnAddress) and // not impossible memory range
(AnAddress >= FCacheAddress) and (AnAddress + ASize <= FCacheAddress + FCacheSize);
end;
function TFpDbgMemCacheSimple.ReadMemory(AnAddress: TDbgPtr; ASize: Cardinal;
ADest: Pointer): Boolean;
begin
Result := False;
if (AnAddress < FCacheAddress) or (AnAddress + ASize > FCacheAddress + FCacheSize) or
if (ASize > High(TDbgPtr) - AnAddress) or // impossible memory range
(AnAddress < FCacheAddress) or (AnAddress + ASize > FCacheAddress + FCacheSize) or
FFailed
then
exit;
@ -710,6 +712,9 @@ var
Node: TAVLTreeNode;
begin
Result := False;
if ASize > High(TDbgPtr) - AnAddress then // impossible memory range
exit;
Node := FCaches.FindNearestKey(@AnAddress, @CompareKey);
if Node = nil then
exit;
@ -899,6 +904,11 @@ var
TmpVal: TDbgPtr;
ConvData: TFpDbgMemConvData;
begin
if ASize > High(TDbgPtr) - ALocation.Address then begin
FLastError := CreateError(fpErrCanNotReadMemAtAddr, [ALocation.Address]);
exit;
end;
FLastError := NoError;
Result := False;
if AContext = nil then