From: Christian Heller <c.heller@plomlompom.de>
Date: Wed, 3 Sep 2014 00:13:23 +0000 (+0200)
Subject: Server: In mv_yx_in_dir_wrap(), test for excess wrapping.
X-Git-Tag: tce~639
X-Git-Url: https://plomlompom.com/repos/?a=commitdiff_plain;h=bc7f716bd4845e9660d904cad7b9f7d813e22541;p=plomrogue

Server: In mv_yx_in_dir_wrap(), test for excess wrapping.
---

diff --git a/src/server/map.c b/src/server/map.c
index 40aaaa9..d4265f3 100644
--- a/src/server/map.c
+++ b/src/server/map.c
@@ -1,7 +1,7 @@
 /* src/server/map.c */
 
 #include "map.h"
-#include <stdint.h> /* uint8_t, int8_t, uint16_t, uint32_t, UINT16_MAX */
+#include <stdint.h> /* uint8_t, int8_t, uint16_t, uint32_t, (U)INT*_(MIN|MAX) */
 #include <stdlib.h> /* free() */
 #include <string.h> /* strchr() */
 #include "../common/rexit.h" /* exit_err() */
@@ -42,7 +42,7 @@ static void make_trees();
 
 static void mv_yx_in_dir(char d, struct yx_uint8 * yx)
 {
-    if     (d == 'e')
+    if      (d == 'e')
     {
         yx->x = yx->x + (yx->y % 2);
         yx->y--;
@@ -78,6 +78,9 @@ static uint8_t mv_yx_in_dir_wrap(char d, struct yx_uint8 * yx)
 {
     static int8_t wrap_west_east   = 0;
     static int8_t wrap_north_south = 0;
+    char * err = "Too much wrapping in mv_yx_in_dir_wrap().";
+    exit_err(INT8_MIN == wrap_west_east || INT8_MIN == wrap_north_south, err);
+    exit_err(INT8_MAX == wrap_west_east || INT8_MAX == wrap_north_south, err);
     if (!yx)
     {
         wrap_west_east = wrap_north_south = 0;