diff options
| author | shennetsind <ind@henn.et> | 2015-01-18 11:37:45 -0200 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2015-01-18 11:37:45 -0200 |
| commit | d0725afa8363b5f7b0612e087b48013d39339039 (patch) | |
| tree | 3f521b45f4b0f0d3e7dee31cacfdd78d7be867ab /src/map/npc.c | |
| parent | a3c4d675ba19df385be5d1e3966c61de7186da57 (diff) | |
| download | hercules-d0725afa8363b5f7b0612e087b48013d39339039.tar.gz hercules-d0725afa8363b5f7b0612e087b48013d39339039.tar.bz2 hercules-d0725afa8363b5f7b0612e087b48013d39339039.tar.xz hercules-d0725afa8363b5f7b0612e087b48013d39339039.zip | |
Fixing 38 issues
Addressing out of bounds read/write, pointless null checks on already deferenced variables, dead code.
Special Thanks to 4144 and Haruna!
Signed-off-by: shennetsind <ind@henn.et>
Diffstat (limited to 'src/map/npc.c')
| -rw-r--r-- | src/map/npc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/map/npc.c b/src/map/npc.c index 38ba9ae41..c00094f8c 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -3876,7 +3876,7 @@ const char* npc_parse_mapflag(char* w1, char* w2, char* w3, char* w4, const char map->list[m].flag.nomvploot=state; else if (!strcmpi(w3,"nocommand")) { if (state) { - if (sscanf(w4, "%d", &state) == 1) + if (w4 && sscanf(w4, "%d", &state) == 1) map->list[m].nocommand =state; else //No level specified, block everyone. map->list[m].nocommand =100; @@ -4113,7 +4113,6 @@ int npc_parsesrcfile(const char* filepath, bool runOnInit) { // More info at http://unicode.org/faq/utf_bom.html#bom5 and http://en.wikipedia.org/wiki/Byte_order_mark#UTF-8 ShowError("npc_parsesrcfile: Detected unsupported UTF-8 BOM in file '%s'. Stopping (please consider using another character set.)\n", filepath); aFree(buffer); - fclose(fp); return EXIT_FAILURE; } |