diff --git a/components/lazutils/lconvencoding.pas b/components/lazutils/lconvencoding.pas index bd3911074b..49982e2a03 100644 --- a/components/lazutils/lconvencoding.pas +++ b/components/lazutils/lconvencoding.pas @@ -5238,7 +5238,11 @@ const function UTF8BOMToUTF8(const s: string): string; begin - Result:=copy(s,4,length(s)); + if s='' then exit(''); + if CompareMem(@UTF8BOM[1],@s[1],length(UTF8BOM)) then + Result:=copy(s,4,length(s)) + else + Result:=s; end; function ISO_8859_1ToUTF8(const s: string): string;