paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-23 20:59:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

LCL: Take care of empty stream in TPortableAnyMapGraphic.IsStreamFormatSupported. Issue #31160, patch from José Mejuto.

Browse Source 
git-svn-id: trunk@53867 -
This commit is contained in:
juha 2017-01-03 14:37:25 +00:00
parent c4b93b0b50
commit a8646edc09
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lcl/include/pnm.inc
View File

@ -32,16 +32,19 @@ end;
class function TPortableAnyMapGraphic.IsStreamFormatSupported(Stream: TStream): Boolean;
var
Pos: Int64;
C: Char;
C: array [0..1] of Char;
r: integer;
begin
Pos := Stream.Position;
try
Stream.ReadBuffer(C, 1);
Result := (C = 'P');
if not Result then
Exit;
Stream.ReadBuffer(C, 1);
Result := (Ord(C)-Ord('0')) in [1..6];
r := Stream.Read(C, 2);
if r = 2 then
begin
Result := (C[0] = 'P');
Result := Result and ((Ord(C[1])-Ord('0')) in [1..6]); // P1,P2,..,P6
end else begin
Result := False;
end;
finally
Stream.Position := Pos;
end;