From 944e99d71c99c65565fb2c4d0fe96ee4e8e66d98 Mon Sep 17 00:00:00 2001 From: ondrej Date: Thu, 2 Jan 2020 20:04:52 +0000 Subject: [PATCH] sysutils: TEncoding.IsStandardEncoding: FSystemEncodings are standard encodings (they must not be destroyed in user code) git-svn-id: trunk@43846 - --- rtl/objpas/sysutils/sysencoding.inc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/rtl/objpas/sysutils/sysencoding.inc b/rtl/objpas/sysutils/sysencoding.inc index 8b0e684e3f..23e27ab730 100644 --- a/rtl/objpas/sysutils/sysencoding.inc +++ b/rtl/objpas/sysutils/sysencoding.inc @@ -240,9 +240,14 @@ var Encoding: TEncoding; begin if Assigned(AEncoding) then + begin for Encoding in FStandardEncodings do if Encoding = AEncoding then Exit(True); + for Encoding in FSystemEncodings do + if Encoding = AEncoding then + Exit(True); + end; Result := False; end;