paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-22 17:49:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

* avoid partial matches on extensions in TFPCustomImage.FindHandlerFromExtension

Browse Source 
Patch by Ondrej

git-svn-id: trunk@39172 -
This commit is contained in:
marco 2018-06-04 14:33:03 +00:00
parent e6a8c058e0
commit c3ac166614
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/fcl-image/src/fpimage.inc
View File

@ -264,22 +264,25 @@ begin
result := FExtra.count; result := FExtra.count;
end; end;
const dumchar = ';';
class function TFPCustomImage.FindHandlerFromExtension(extension: String class function TFPCustomImage.FindHandlerFromExtension(extension: String
): TIHData; ): TIHData;
var s : string; var s : string;
r : integer; r : integer;
begin begin
if extension='' then
Exit(nil);
extension := lowercase (extension); extension := lowercase (extension);
if (extension <> '') and (extension[1] = '.') then if (extension <> '') and (extension[1] = '.') then
delete (extension,1,1); delete (extension,1,1);
with ImageHandlers do with ImageHandlers do
begin begin
r := count-1; r := count-1;
s := extension + ';'; s := dumchar + extension + dumchar;
while (r >= 0) do while (r >= 0) do
begin begin
Result := GetData(r); Result := GetData(r);
if (pos(s,Result.Fextension+';') <> 0) then if (pos(s, dumchar+Result.Fextension+dumchar) <> 0) then
Exit; Exit;
dec (r); dec (r);
end; end;