shithub: puzzles

Info  •  Files  •  Log  •  Branches

Last-ditch grid-size limit for Dominosa

At least prevent integer overflow when constructing the grid.

--- a/dominosa.c

+++ b/dominosa.c

@@ -47,6 +47,7 @@

 #include <string.h>

 #include <assert.h>

 #include <ctype.h>

+#include <limits.h>

 #include <math.h>

 #include "puzzles.h"

@@ -243,6 +244,10 @@

 {

     if (params->n < 1)

         return "Maximum face number must be at least one";

+    if (params->n > INT_MAX - 2 ||

+        params->n + 2 > INT_MAX / (params->n + 1))

+        return "Maximum face number must not be unreasonably large";

+

     if (params->diff >= DIFFCOUNT)

         return "Unknown difficulty rating";

     return NULL;