diff --git a/src/engine/e_msg.pas b/src/engine/e_msg.pas
index a2ecc52e3e9a40e6a2c58dede4d26344e35847b3..6a6ca61fe14037c63fc488a3b202b1a7275724b5 100644 (file)
--- a/src/engine/e_msg.pas
+++ b/src/engine/e_msg.pas
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation, version 3 of the License ONLY.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
CurSize: Integer;
ReadCount: Integer;
Bit: Integer;
+ AllocStep: Integer;
OwnMemory: Boolean;
function Init(V: Pointer; N: Integer; Full: Boolean = False): Boolean;
if P = nil then
raise Exception.Create('TMsg.Alloc: no mem');
Init(P, N);
+ AllocStep := N;
OwnMemory := True;
end;
end;
procedure TMsg.WriteData(V: Pointer; N: Integer);
+var
+ NewSize: Integer;
begin
if CurSize + N > MaxSize then
begin
- Overflow := True;
- raise Exception.Create('TMsg.WriteData: buffer overrun!');
- Exit;
+ if OwnMemory then
+ begin
+ NewSize := MaxSize + ((N + AllocStep - 1) div AllocStep) * AllocStep; // round up
+ if ReAllocMem(Data, NewSize) = nil then
+ raise Exception.Create('TMsg.WriteData: out of memory on realloc');
+ MaxSize := NewSize;
+ end
+ else
+ begin
+ Overflow := True;
+ raise Exception.Create('TMsg.WriteData: buffer overrun on borrowed memory!');
+ end;
end;
+
Move(V^, (Data + CurSize)^, N);
CurSize := CurSize + N;
end;
procedure TMsg.Write(V: TMsg);
begin
- if CurSize + V.CurSize > MaxSize then
- begin
- Overflow := True;
- raise Exception.Create('TMsg.WriteData: buffer overrun!');
- Exit;
- end;
- Move(V.Data^, (Data + CurSize)^, V.CurSize);
- CurSize := CurSize + V.CurSize;
+ WriteData(V.Data, V.CurSize);
end;
procedure TMsg.Write(V: Byte); overload;