diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2013-06-22 22:30:13 -0700 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2013-06-23 22:07:50 -0700 |
| commit | dbbfda0e96037da4f208ff8f00d181a5294484ae (patch) | |
| tree | 7a7b9982c6d98ddc2271aade72040ea9233a4a11 /src/map/npc.cpp | |
| parent | 83db3bbee4e19e7426a32ee89ad6c2d8e48260f2 (diff) | |
| download | tmwa-dbbfda0e96037da4f208ff8f00d181a5294484ae.tar.gz tmwa-dbbfda0e96037da4f208ff8f00d181a5294484ae.tar.bz2 tmwa-dbbfda0e96037da4f208ff8f00d181a5294484ae.tar.xz tmwa-dbbfda0e96037da4f208ff8f00d181a5294484ae.zip | |
add new stuff stuff (with tests!), poison memcmp and strncpy
Diffstat (limited to 'src/map/npc.cpp')
| -rw-r--r-- | src/map/npc.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/map/npc.cpp b/src/map/npc.cpp index 91331cb..ab6892a 100644 --- a/src/map/npc.cpp +++ b/src/map/npc.cpp @@ -205,8 +205,7 @@ int npc_event_doall_l(const char *name, int rid, int argc, argrec_t *args) int c = 0; char buf[64] = "::"; - strncpy(buf + 2, name, sizeof(buf)-3); - buf[sizeof(buf)-1] = '\0'; + strzcpy(buf + 2, name, 62); for (auto& pair : ev_db) npc_event_doall_sub(pair.first, &pair.second, &c, buf, rid, argc, args); return c; @@ -1624,10 +1623,8 @@ dumb_ptr<npc_data> npc_spawn_text(map_local *m, int x, int y, retval->bl_type = BL::NPC; retval->npc_subtype = NpcSubtype::MESSAGE; - strncpy(retval->name, name, 23); - strncpy(retval->exname, name, 23); - retval->name[15] = 0; - retval->exname[15] = 0; + strzcpy(retval->name, name, 24); + strzcpy(retval->exname, name, 24); if (message) retval->message = message; |