Fix dogfight map07 shotgun bullet

Fix possible buffer overflow
cxong · Jul 21, 2016 · 8663f8d · 8663f8d
1 parent 70bf1ef
commit 8663f8d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/dogfights/map07.cdogscpn/bullets.json b/dogfights/map07.cdogscpn/bullets.json
@@ -5,7 +5,7 @@
       "Name": "sshotgun",
       "Pic": {
         "Type": "Normal",
-        "Sprites": "bullet_ball"
+        "Pic": "bullet_ball"
       },
       "Speed": 1280,
       "Range": 30,

diff --git a/src/cdogs/blit.c b/src/cdogs/blit.c
@@ -235,6 +235,11 @@ void BlitMasked(
 	int isTransparent)
 {
 	Uint32 *current = pic->Data;
+	if (current == NULL)
+	{
+		CASSERT(false, "unexpected NULL pic data");
+		return;
+	}
 	const Uint32 maskPixel = COLOR2PIXEL(mask);
 	int i;
 	pos = Vec2iAdd(pos, pic->offset);

diff --git a/src/cdogs/pic_manager.c b/src/cdogs/pic_manager.c
@@ -694,7 +694,7 @@ static void MaybeAddStyleName(
 		return;
 	}
 	const char *nextSlash = strchr(picName + strlen(prefix), '/');
-	char buf[CDOGS_FILENAME_MAX];
+	char buf[CDOGS_PATH_MAX];
 	const size_t len = nextSlash - picName - strlen(prefix);
 	strncpy(buf, picName + strlen(prefix), len);
 	buf[len] = '\0';