Memory management and other fixes from James H.

[sgt-puzzles.git] / map.c

diff --git a/map.c b/map.c
index e3ded2889e710624577cd3006e7aa1fab44f1748..12cf5078f89d25c0df7f964095b2b80f43861ea1 100644 (file)
--- a/map.c
+++ b/map.c
@@ -1373,6 +1373,7 @@ static int map_solver(struct solver_scratch *sc,
              */
         }
 
+        sfree(origcolouring);
         sfree(subcolouring);
         free_scratch(rsc);
 
@@ -1788,9 +1789,9 @@ static char *validate_desc(game_params *params, char *desc)
 
     map = snewn(2*wh, int);
     ret = parse_edge_list(params, &desc, map);
+    sfree(map);
     if (ret)
        return ret;
-    sfree(map);
 
     if (*desc != ',')
        return "Expected comma before clue list";