Changeset 441 for Generics/TemplateGenerics/Additional/UBinarySerializer.pas

Timestamp:

Nov 19, 2012, 2:47:07 PM (12 years ago)

Author:

chronos

Message:

• Fixed: Wrong memory inicialization in TListObject results in error during other object assignment.

File:

• Generics/TemplateGenerics/Additional/UBinarySerializer.pas (modified) (9 diffs)

Generics/TemplateGenerics/Additional/UBinarySerializer.pas

@@ -25 +25 @@
     Position: Integer;
     OwnsList: Boolean;
-    procedure Write(var Buffer; Count: Integer); inline;
-    procedure Read(var Buffer; Count: Integer); inline;
+    procedure Write(var Buffer; Count: Integer); //inline;
+    procedure Read(var Buffer; Count: Integer); //inline;
 
     procedure Assign(Source: TBinarySerializer);
@@ -73 +73 @@
   StringLength: Longint;
 begin
-  FList.ReadBuffer(StringLength, SizeOf(StringLength));
+  StringLength := 0;
+  Read(StringLength, SizeOf(StringLength));
   Result := ReadString(StringLength);
 end;
@@ -102 +103 @@
 function TBinarySerializer.ReadByte: Byte;
 begin
+  Result := 0;
   Read(Result, SizeOf(Byte));
 end;
@@ -107 +109 @@
 function TBinarySerializer.ReadCardinal: Cardinal;
 begin
+  Result := 0;
   Read(Result, SizeOf(Cardinal));
   if SwapData then Result := SwapEndian(Result);
@@ -113 +116 @@
 function TBinarySerializer.ReadInt64: Int64;
 begin
+  Result := 0;
   Read(Result, SizeOf(Int64));
   if SwapData then Result := SwapEndian(Result);
@@ -129 +133 @@
   Count: Byte;
 begin
+  Count := 0;
   Read(Count, 1);
   Result := ReadString(Count);
@@ -223 +228 @@
 function TBinarySerializer.ReadDouble: Double;
 begin
+  Result := 0;
   Read(Result, SizeOf(Double));
 end;
@@ -228 +234 @@
 function TBinarySerializer.ReadSingle: Single;
 begin
+  Result := 0;
   Read(Result, SizeOf(Single));
 end;
@@ -233 +240 @@
 function TBinarySerializer.ReadWord: Word;
 begin
+  Result := 0;
   Read(Result, SizeOf(Word));
   if SwapData then Result := SwapEndian(Result);