diff options
| author | shennetsind <ind@henn.et> | 2015-01-17 20:18:49 -0200 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2015-01-17 20:18:49 -0200 |
| commit | a3c4d675ba19df385be5d1e3966c61de7186da57 (patch) | |
| tree | 45b4a026a758afb1a54387cdadb91d55eba621f8 /src/map/mercenary.c | |
| parent | 3e53a34615c2535dbed3d7c2c7a00f1ef3eaff0a (diff) | |
| download | hercules-a3c4d675ba19df385be5d1e3966c61de7186da57.tar.gz hercules-a3c4d675ba19df385be5d1e3966c61de7186da57.tar.bz2 hercules-a3c4d675ba19df385be5d1e3966c61de7186da57.tar.xz hercules-a3c4d675ba19df385be5d1e3966c61de7186da57.zip | |
27 Fixes
Addressing out of bounds read/write, pointless null checks on already deferenced variables.
Special Thanks to 4144 and Haruna!
Signed-off-by: shennetsind <ind@henn.et>
Diffstat (limited to 'src/map/mercenary.c')
| -rw-r--r-- | src/map/mercenary.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/mercenary.c b/src/map/mercenary.c index a1503e97a..84f6a3c41 100644 --- a/src/map/mercenary.c +++ b/src/map/mercenary.c @@ -333,7 +333,7 @@ int merc_data_received(struct s_mercenary *merc, bool flag) { mercenary->set_calls(md, 1); sd->status.mer_id = merc->mercenary_id; - if( md && md->bl.prev == NULL && sd->bl.prev != NULL ) { + if( md->bl.prev == NULL && sd->bl.prev != NULL ) { map->addblock(&md->bl); clif->spawn(&md->bl); clif->mercenary_info(sd); |