shithub: choc

Info  •  Files  •  Log  •  Branches

Merge pull request #1295 from chocolate-doom/CVE-2020-14983

CVE-2020-14983

--- a/src/d_loop.c

+++ b/src/d_loop.c

@@ -413,6 +413,11 @@

     ticdup = settings->ticdup;

     new_sync = settings->new_sync;

+    if (ticdup < 1)

+    {

+        I_Error("D_StartNetGame: invalid ticdup value (%d)", ticdup);

+    }

+

     // TODO: Message disabled until we fix new_sync.

     //if (!new_sync)

     //{

--- a/src/net_structrw.c

+++ b/src/net_structrw.c

@@ -116,7 +116,7 @@

         return false;

     }

-    for (i = 0; i < settings->num_players; ++i)

+    for (i = 0; i < settings->num_players && i < NET_MAXPLAYERS; ++i)

     {

         if (!NET_ReadInt8(packet,

                           (unsigned int *) &settings->player_classes[i]))