diff options
| -rw-r--r-- | 3rdparty/libconfig/libconfig.c | 3 | ||||
| -rw-r--r-- | src/map/npc.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/3rdparty/libconfig/libconfig.c b/3rdparty/libconfig/libconfig.c index 5b6eaac73..9077b0131 100644 --- a/3rdparty/libconfig/libconfig.c +++ b/3rdparty/libconfig/libconfig.c @@ -860,6 +860,7 @@ static int __config_setting_get_int(const struct config_setting_t *setting, } else { /* fall through */ } + return(CONFIG_FALSE); default: return(CONFIG_FALSE); @@ -898,6 +899,7 @@ static int __config_setting_get_int64(const struct config_setting_t *setting, } else { /* fall through */ } + return(CONFIG_FALSE); default: return(CONFIG_FALSE); @@ -965,6 +967,7 @@ static int __config_setting_get_float(const struct config_setting_t *setting, } else { /* fall through */ } + return(CONFIG_FALSE); default: return(CONFIG_FALSE); diff --git a/src/map/npc.c b/src/map/npc.c index 38996a0a3..6beff2b77 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -2617,7 +2617,7 @@ void npc_parsename(struct npc_data* nd, const char* name, const char* start, con do { ++i; - snprintf(newname, ARRAYLENGTH(newname), "%d_%d_%d_%d", i, nd->bl.m, nd->bl.x, nd->bl.y); + safesnprintf(newname, ARRAYLENGTH(newname), "%d_%d_%d_%d", i, nd->bl.m, nd->bl.x, nd->bl.y); } while( npc->name2id(newname) != NULL ); strcpy(this_mapname, (nd->bl.m == -1 ? "(not on a map)" : mapindex_id2name(map_id2index(nd->bl.m)))); |