Changeset 438 for trunk

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.

Location:

trunk

Files:

• CmdList.pas (modified) (5 diffs)
• LocalPlayer/MessgEx.pas (modified) (1 diff)
• LocalPlayer/Select.pas (modified) (5 diffs)
• LocalPlayer/Term.pas (modified) (10 diffs)
• LocalPlayer/Tribes.pas (modified) (3 diffs)
• Log.pas (modified) (1 diff)

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;
 

trunk/LocalPlayer/MessgEx.pas

@@ -64 +64 @@
 uses
   ClientTools, BaseWin, Term, Help, UnitStat, Tribes, UPixelPointer,
-  IsoEngine, Diagram, Sound;
+  Diagram, Sound;
 
 {$R *.lfm}

trunk/LocalPlayer/Select.pas

@@ -5 +5 @@
 
 uses
-  Protocol, ClientTools, Term, ScreenTools, IsoEngine, PVSB, BaseWin,
+  Protocol, ClientTools, Term, ScreenTools, PVSB, BaseWin,
   LCLIntf, LCLType, Messages, SysUtils, Classes, Graphics, Controls, Forms,
   ExtCtrls, ButtonB, ButtonBase, Menus, Types;
@@ -99 +99 @@
 
 uses
-  CityScreen, Help, UnitStat, Tribes, Inp;
+  CityScreen, Help, UnitStat, Tribes, Inp, CmdList;
 
 {$R *.lfm}
@@ -865 +865 @@
     CityNameInfo.ID := MyCity[cix].ID;
     CityNameInfo.NewName := InputDlg.EInput.Text;
-    Server(cSetCityName, me, 0, CityNameInfo);
+    if CityNameInfo.GetCommandDataSize > CommandDataMaxSize then
+      Delete(CityNameInfo.NewName, Length(CityNameInfo.NewName) -
+        (CityNameInfo.GetCommandDataSize - 1 - CommandDataMaxSize), MaxInt);
+    Server(CommandWithData(cSetCityName, CityNameInfo.GetCommandDataSize),
+      me, 0, CityNameInfo);
     if CityDlg.Visible then
     begin
@@ -871 +875 @@
       CityDlg.Invalidate;
     end;
-    result := true;
+    Result := True;
   end
   else
-    result := false;
+    Result := False;
 end;
 
@@ -890 +894 @@
     ModelNameInfo.mix := mix;
     ModelNameInfo.NewName := InputDlg.EInput.Text;
-    Server(cSetModelName, me, 0, ModelNameInfo);
+    if ModelNameInfo.GetCommandDataSize > CommandDataMaxSize then
+      Delete(ModelNameInfo.NewName, Length(ModelNameInfo.NewName) -
+        (ModelNameInfo.GetCommandDataSize - 1 - CommandDataMaxSize), MaxInt);
+    Server(CommandWithData(cSetModelName, ModelNameInfo.GetCommandDataSize),
+      me, 0, ModelNameInfo);
     if UnitStatDlg.Visible then
     begin

trunk/LocalPlayer/Term.pas

@@ -403 +403 @@
 
 type
+
+  { TTribeInfo }
+
   TTribeInfo = record
     trix: integer;
     FileName: ShortString;
-  end;
+    function GetCommandDataSize: Byte;
+  end;
+
+  { TCityNameInfo }
 
   TCityNameInfo = record
     ID: integer;
     NewName: ShortString;
-  end;
+    function GetCommandDataSize: Byte;
+  end;
+
+  { TModelNameInfo }
 
   TModelNameInfo = record
     mix: integer;
     NewName: ShortString;
+    function GetCommandDataSize: Byte;
   end;
 
@@ -574 +584 @@
   IsControl: boolean = false);
 procedure HelpOnTerrain(Loc: Integer; NewMode: TWindowMode);
+function AlignUp(Value, Alignment: Integer): Integer;
 
 
@@ -581 +592 @@
   Directories, CityScreen, Draft, MessgEx, Select, CityType, Help,
   UnitStat, Log, Diagram, NatStat, Wonders, Enhance, Nego, UPixelPointer, Sound,
-  Battle, Rates, TechTree, Registry, Global, UKeyBindings;
+  Battle, Rates, TechTree, Registry, Global, UKeyBindings, CmdList;
 
 {$R *.lfm}
@@ -760 +771 @@
 end;
 
+function AlignUp(Value, Alignment: Integer): Integer;
+begin
+  Result := Value or (Alignment - 1);
+end;
+
 { *** tribe management procedures *** }
 
@@ -812 +828 @@
       Tribe[p].SetModelPicture(Picture, IsNew)
     else if IsNew then
-      Server(cSetNewModelPicture, 0, 0, Picture)
+      Server(CommandWithData(cSetNewModelPicture, Picture.GetCommandDataSize),
+        0, 0, Picture)
     else
-      Server(cSetModelPicture, 0, 0, Picture)
+      Server(CommandWithData(cSetModelPicture, Picture.GetCommandDataSize),
+        0, 0, Picture)
   else
     with Tribe[p].ModelPicture[mix] do
@@ -961 +979 @@
           ModelNameInfo.mix := MyData.ToldModels;
           ModelNameInfo.NewName := EInput.Text;
-          Server(cSetModelName, me, 0, ModelNameInfo);
+          if ModelNameInfo.GetCommandDataSize > CommandDataMaxSize then
+            Delete(ModelNameInfo.NewName, Length(ModelNameInfo.NewName) -
+             (ModelNameInfo.GetCommandDataSize - 1 - CommandDataMaxSize), MaxInt);
+          Server(CommandWithData(cSetModelName, ModelNameInfo.GetCommandDataSize),
+            me, 0, ModelNameInfo);
         end;
       end;
@@ -972 +994 @@
       inc(MyData.ToldModels);
     end;
+end;
+
+{ TTribeInfo }
+
+function TTribeInfo.GetCommandDataSize: Byte;
+begin
+  Result := SizeOf(trix) + 1 + Length(FileName)
+end;
+
+{ TModelNameInfo }
+
+function TModelNameInfo.GetCommandDataSize: Byte;
+begin
+  Result := SizeOf(mix) + 1 + Length(NewName);
+end;
+
+{ TCityNameInfo }
+
+function TCityNameInfo.GetCommandDataSize: Byte;
+begin
+  Result := SizeOf(ID) + 1 + Length(NewName);
 end;
 
@@ -2731 +2774 @@
                 CreateTribe(TribeInfo.trix, TribeInfo.FileName, false)
               else
-                Server(cSetTribe, 0, 0, TribeInfo);
+                Server(CommandWithData(cSetTribe, TribeInfo.GetCommandDataSize),
+                  0, 0, TribeInfo);
             end;
 
@@ -2745 +2789 @@
                 CreateTribe(TribeInfo.trix, TribeInfo.FileName, false)
               else
-                Server(cSetTribe, 0, 0, TribeInfo);
+                Server(CommandWithData(cSetTribe, TribeInfo.GetCommandDataSize),
+                  0, 0, TribeInfo);
             end;
         end;
@@ -3445 +3490 @@
   else
     if Command >= cClientEx then
-      case Command  of
+      case Command and (not Integer(CommandDataElementCountMask)) of
         cSetTribe:
           with TTribeInfo(Data) do begin

trunk/LocalPlayer/Tribes.pas

@@ -20 +20 @@
     yShield: Integer;
   end;
+
+  { TModelPictureInfo }
 
   TModelPictureInfo = record
@@ -27 +29 @@
     Hash: Integer;
     GrName: ShortString;
+    function GetCommandDataSize: Byte;
   end;
 
@@ -283 +286 @@
 end;
 
+{ TModelPictureInfo }
+
+function TModelPictureInfo.GetCommandDataSize: Byte;
+begin
+  Result := SizeOf(trix) + SizeOf(mix) + SizeOf(pix) + SizeOf(Hash) + 1 +
+    Length(GrName);
+end;
+
 constructor TTribe.Create(FileName: string);
 var

trunk/Log.pas

@@ -5 +5 @@
 
 uses
-  LCLIntf, LCLType, LMessages, Messages, SysUtils, Classes, Graphics, Controls, Forms,
+  LCLIntf, LCLType, Messages, SysUtils, Classes, Graphics, Controls, Forms,
   StdCtrls, Menus;