Sara
/
basic-game-framework
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed out of bounds write in load_tilemap

pull/1/head
Sara 2023-04-11 08:07:26 +02:00
parent 34593e0701
commit 89cc8b9969
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/tilemap.cc
View File

@ -55,8 +55,7 @@ int load_tilemap(const char* file) {
case ' ': case ' ':
case '\n': case '\n':
case '\t': case '\t':
// ignore break; // ignore
break;
case EOF: case EOF:
case ',': case ',':
*writer = '\0'; *writer = '\0';
@ -65,6 +64,7 @@ int load_tilemap(const char* file) {
} else if(entries == 1) { } else if(entries == 1) {
g_tilemap.height = atoi(buf); g_tilemap.height = atoi(buf);
} else { } else {
if(entries-2 >= TILEMAP_MAX_SIZE) goto end_while;
tile->value = (short)atoi(buf); tile->value = (short)atoi(buf);
++tile; ++tile;
} }

2
src/tilemap.hpp
View File

@ -4,7 +4,7 @@
#include "vector" #include "vector"
#include "corelib/render.h" #include "corelib/render.h"
#define TILEMAP_MAX_SIZE 128*128 #define TILEMAP_MAX_SIZE 16384
typedef struct tile_t { typedef struct tile_t {
short value; short value;