Mercurial > hg > early-roguelike
comparison xrogue/sticks.c @ 314:2f0eb38da609
Advanced Rogue 7: fix a crash when casting magic missile.
do_zap() dereferenced a struct object pointer while ignoring the result
of a NULL check. XRogue had the same problem, though triggering it was
unlikely, since XRogue does not include a magic missile spell.
Reported by John Harris of @Play.
| author | John "Elwin" Edwards |
|---|---|
| date | Thu, 21 Oct 2021 21:00:15 -0400 |
| parents | e52a8a7ad4c5 |
| children |
comparison
equal
deleted
inserted
replaced
| 313:2f75940cc544 | 314:2f0eb38da609 |
|---|---|
| 321 MISSILE , {0, 0}, 0, "", "1d4 " , NULL, 0, WS_MISSILE, 50, 1 | 321 MISSILE , {0, 0}, 0, "", "1d4 " , NULL, 0, WS_MISSILE, 50, 1 |
| 322 }; | 322 }; |
| 323 | 323 |
| 324 if (!obj) | 324 if (!obj) |
| 325 dice = zapper->t_stats.s_lvl; | 325 dice = zapper->t_stats.s_lvl; |
| 326 if (obj->o_type == RELIC) | 326 else if (obj->o_type == RELIC) |
| 327 dice = 15; | 327 dice = 15; |
| 328 else if (EQUAL(ws_type[which], "staff")) | 328 else if (EQUAL(ws_type[which], "staff")) |
| 329 dice = 10; | 329 dice = 10; |
| 330 else | 330 else |
| 331 dice = 6; | 331 dice = 6; |