paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-17 12:39:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Actually observe TStringStream.OwnsEncoding in destructor

Browse Source 
git-svn-id: trunk@39379 -
This commit is contained in:
michael 2018-07-04 11:03:21 +00:00
parent de160955e6
commit 844a9b0ca6
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
rtl/objpas/classes/classesh.inc
View File

@ -1039,6 +1039,7 @@ type
constructor Create(const AString: UnicodeString); overload;
constructor Create(const AString: UnicodeString; AEncoding: TEncoding; AOwnsEncoding: Boolean = True); overload;
constructor Create(const AString: UnicodeString; ACodePage: Integer); overload;
Destructor Destroy; override;
function ReadUnicodeString(Count: Longint): UnicodeString;
procedure WriteUnicodeString(const AString: UnicodeString);
function ReadAnsiString(Count: Longint): AnsiString;

7
rtl/objpas/classes/streams.inc
View File

@ -874,6 +874,13 @@ begin
Create(AString,TEncoding.GetEncoding(ACodePage),true);
end;
destructor TStringStream.Destroy;
begin
If FOwnsEncoding then
FreeAndNil(FEncoding);
inherited Destroy;
end;
function TStringStream.ReadString(Count: Longint): string;