pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

fpexif: Fix some range check errors. Patch by forum user Mirkasp (https://forum.lazarus.freepascal.org/index.php/topic,60105.msg448827).

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@8366 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2022-07-28 20:48:21 +00:00
parent c778149181
commit 5715d71739
2 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/fpexif/fpemetadata.pas
View File

@ -544,7 +544,11 @@ begin
repeat repeat
marker := ReadByte(AStream); marker := ReadByte(AStream);
until marker <> $FF; until marker <> $FF;
size := BEtoN(ReadWord(AStream)) - 2; size := BEToN(ReadWord(AStream));
if size < 2 then
Continue;
size := size - 2;
// size := BEtoN(ReadWord(AStream)) - 2;
p := AStream.Position; p := AStream.Position;
case marker of case marker of
M_EXIF: M_EXIF:

25
components/fpexif/fpeutils.pas
View File

@ -111,7 +111,7 @@ procedure JPEGScaleImage(ASrcStream, ADestStream: TStream;
ADestSize: Integer = DEFAULT_THUMBNAIL_SIZE); ADestSize: Integer = DEFAULT_THUMBNAIL_SIZE);
// Buffer utils // Buffer utils
function PosInBytes(AText: ansistring; ABuffer: TBytes): Integer; function PosInBytes(const AText: ansistring; const ABuffer: TBytes): Integer;
// Date/time utils // Date/time utils
function LocalTimeZoneStr: String; function LocalTimeZoneStr: String;
@ -1353,9 +1353,23 @@ end;
// Buffer utilities // Buffer utilities
//============================================================================== //==============================================================================
function PosInBytes(const AText: AnsiString; const ABuffer: TBytes): Integer;
var
len: Integer;
begin
len := Length(AText);
if (len > 0) and Assigned(ABuffer) then begin
for Result := Low(ABuffer) to High(ABuffer) - len + 1 do
if {%H-}CompareMem(@ABuffer[Result], Pointer(AText), len) then
exit;
end;
Result := -1;
end;
(*
function PosInBytes(AText: AnsiString; ABuffer: TBytes): Integer; function PosInBytes(AText: AnsiString; ABuffer: TBytes): Integer;
var var
i, j: Integer; i, j, len: Integer;
found: Boolean; found: Boolean;
begin begin
if (AText = '') or (ABuffer = nil) then begin if (AText = '') or (ABuffer = nil) then begin
@ -1363,10 +1377,11 @@ begin
exit; exit;
end; end;
for i:= 0 to High(ABuffer) do len := Length(AText);
for i:= 0 to High(ABuffer) - len + 1 do
if ABuffer[i] = ord(AText[1]) then begin if ABuffer[i] = ord(AText[1]) then begin
found := true; found := true;
for j := 2 to Length(AText) do for j := 2 to len do
if ABuffer[i+j-1] <> ord(AText[j]) then begin if ABuffer[i+j-1] <> ord(AText[j]) then begin
found := false; found := false;
break; break;
@ -1379,7 +1394,7 @@ begin
Result := -1; Result := -1;
end; end;
*)
//============================================================================== //==============================================================================
// Date/time utilities // Date/time utilities