Changeset 174 for CoolStreaming/UVarBlockSerializer.pas

Timestamp:

Feb 23, 2011, 8:57:12 AM (13 years ago)

Author:

george

Message:

• Fixed: Wrong size returned by GetVarSize method.

File:

• CoolStreaming/UVarBlockSerializer.pas (modified) (4 diffs)

CoolStreaming/UVarBlockSerializer.pas

@@ -106 +106 @@
   SMaskedValueReadError = 'Error reading masked variable length block.';
   SUInt64Overflow = '64-bit UInt read overflow.';
+  SReadError = 'Stream read error. Expected length %d, read %d. Source stream size %d.';
 
 { TVarBlockSerializer }
@@ -365 +366 @@
   Data: Byte;
   Length: Cardinal;
-  I: Cardinal;
+  RealLength: Cardinal;
   LengthMask: Byte;
 begin
   AStream.Size := 0;
-  I := 0;
   Length := 1;
 
@@ -400 +400 @@
 
   // If CopyFrom parameter count is zero then whole source is copied
-  if Length > 1 then
-    AStream.CopyFrom(Stream, Length - 1);
+  if Length > 1 then begin
+    RealLength := AStream.CopyFrom(Stream, Length - 1);
+    if RealLength < (Length - 1) then
+      raise EReadError.Create(Format(SReadError, [Length - 1, RealLength, Stream.Size]));
+  end;
   AStream.Position := 0;
 end;
@@ -413 +416 @@
   Result := 1; // Byte block length
   Data := Stream.ReadByte;
-  if Data = $ff then Result := ReadVarUInt + 2
+  if Data = $ff then Result := GetVarSize + ReadVarUInt + 1
   else begin
     Result := DecodeUnaryLength(Data);