Changeset 438 for trunk/CmdList.pas

Timestamp:

May 18, 2022, 11:12:29 AM (2 years ago)

Author:

chronos

Message:

• Fixed: Data size was not correctly stored in server commands. Introduced in rev 435.
• Fixed: Check data size for its maximum. Limit maximum length of unit and city name so it can fit into data block.

File:

• trunk/CmdList.pas (modified) (5 diffs)

trunk/CmdList.pas

@@ -5 +5 @@
 
 uses
-  Classes;
+  Classes, SysUtils, Math;
 
 const
   MaxDataSize = 1024;
+  CommandDataElementSize = 4;
+  CommandDataElementCountMask = $f;
+  CommandDataMaxSize = CommandDataElementSize * CommandDataElementCountMask;
 
 type
@@ -44 +47 @@
   end;
 
+  function CommandWithData(Command: Integer; DataSize: Byte): Integer;
+
+resourcestring
+  SCommandDataSizeError = 'Command data size %d out of range (0-%d).';
+
+
 implementation
 
@@ -55 +64 @@
   TData = array [0 .. MaxDataSize - 1] of Cardinal;
   PData = ^TData;
+
+function CommandWithData(Command: Integer; DataSize: Byte): Integer;
+var
+  DataElementCount: Byte;
+begin
+  if DataSize > CommandDataMaxSize then
+    raise Exception.Create(Format(SCommandDataSizeError, [DataSize, CommandDataMaxSize]));
+  DataElementCount := Ceil(DataSize / CommandDataElementSize);
+  Result := Command or (DataElementCount and CommandDataElementCountMask);
+end;
 
 constructor TCmdList.Create;
@@ -139 +158 @@
     end;
 
-    if Command and $F = 0 then
+    if Command and CommandDataElementCountMask = 0 then
       Data := nil
     else
     begin
       Data := @LogData[FState.LoadPos];
-      inc(FState.LoadPos, Command and $F * 4);
+      inc(FState.LoadPos, Command and CommandDataElementCountMask * CommandDataElementSize);
     end;
   end;
@@ -232 +251 @@
     end;
   end;
-  if Command and $F <> 0 then
-    PutData(Data, Command and $F * 4);
+  if Command and CommandDataElementCountMask <> 0 then
+    PutData(Data, Command and CommandDataElementCountMask * CommandDataElementSize);
 end;