Mantis 5491: TJclSimpleXml.SaveToString generates garbage when saving UTF-16 strings (in Delphi XE).

Author: outchy

jcl/source/common/JclSimpleXml.pas

@@ -1325,7 +1325,7 @@ function TJclSimpleXML.SaveToString: string;
 var
   Stream: TStringStream;
 begin
-  Stream := TStringStream.Create('');
+  Stream := TStringStream.Create('' {$IFDEF SUPPORTS_UNICODE}, CP_UTF16LE{$ENDIF});
   try
     SaveToStream(Stream);
     Result := Stream.DataString;

jcl/source/common/JclStreams.pas

@@ -2402,7 +2402,7 @@ function TJclStringStream.InternalSetNextBuffer(S: TStream;
 
 procedure TJclStringStream.InvalidateBuffers;
 begin
-  FStrBufferStart := FStream.Seek(Length(FBOM), soCurrent);
+  FStrBufferStart := FStream.Seek(0, soCurrent);
   FStrBufferNext := FStrBufferStart;
   FStrBufferPosition := 0;
   FStrBufferCurrentSize := 0;
@@ -2953,8 +2953,6 @@ function TJclUTF16Stream.InternalSetNextChar(S: TStream; Ch: UCS4): Boolean;
 
 constructor TJclAutoStream.Create(AStream: TStream; AOwnsStream: Boolean);
 var
-  ResetPos: Boolean;
-  Pos: Int64;
   I, MaxLength, ReadLength: Integer;
   BOM: array of Byte;
 begin
@@ -2963,9 +2961,6 @@ constructor TJclAutoStream.Create(AStream: TStream; AOwnsStream: Boolean);
   if MaxLength < Length(BOM_UTF16_LSB) then
     MaxLength := Length(BOM_UTF16_LSB);
 
-  ResetPos := False;
-  Pos := FStream.Seek(0, soCurrent);
-
   SetLength(BOM, MaxLength);
   ReadLength := FStream.Read(BOM[0], Length(BOM) * SizeOf(BOM[0])) div SizeOf(BOM[0]);
 
@@ -2980,7 +2975,6 @@ constructor TJclAutoStream.Create(AStream: TStream; AOwnsStream: Boolean);
       if BOM[I - Low(BOM_UTF8)] <> BOM_UTF8[I] then
     begin
       FEncoding := seAuto;
-      ResetPos := True;
       Break;
     end;
   end;
@@ -2994,7 +2988,6 @@ constructor TJclAutoStream.Create(AStream: TStream; AOwnsStream: Boolean);
       if BOM[I - Low(BOM_UTF8)] <> BOM_UTF16_LSB[I] then
     begin
       FEncoding := seAuto;
-      ResetPos := True;
       Break;
     end;
   end;
@@ -3023,8 +3016,7 @@ constructor TJclAutoStream.Create(AStream: TStream; AOwnsStream: Boolean);
         SetLength(FBOM, 0);
       end;
   end;
-  if ResetPos then
-    FStream.Seek(Pos, soBeginning);
+  FStream.Seek(Length(FBOM) - ReadLength, soCurrent);
   InvalidateBuffers;
 end;
 
@@ -3090,6 +3082,7 @@ function TJclAutoStream.SkipBOM: LongInt;
 begin
   // already skipped to determine encoding
   Result := 0;
+  InvalidateBuffers;
 end;
 
 {$IFDEF UNITVERSIONING}