|
Description |
ouch.cc function check_your_resists requires a valid 'bolt *beam' when doEffects is true, but does not validate this assumption.
The function itself has two purposes, based on the doEffects value; when false, it calculates an effect; when true, it also applies an effect.
In most cases, applying the effect appears not to require a valid *beam, and everything is fine.
However, the effect BEAM_POISON_ARROW requires a valid *beam as its calculations depend on the damage.num and damage.size properties.
So the attached patch validates that, when doEffect is true, a valid *beam was provided, before trying to dereference it and crashing.
I wasn't able to find any instances of code mis-using this function, either under check_your_resists() or player::beam_resists(), but I'm not familiar with this. |
|
Attached Files |
 beam_assert_2.patch [^] (811 bytes) 2014-04-23 04:04 [Show Content] [Hide Content]From 67e6867882a2242a0e9e3f7fa1ade5601299183d Mon Sep 17 00:00:00 2001
From: Richard Soderberg <rsoderberg@gmail.com>
Date: Tue, 22 Apr 2014 16:45:25 -0700
Subject: [PATCH] ouch.cc: check_your_resists needs a valid *bolt when
doEffects is true
---
crawl-ref/source/ouch.cc | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/crawl-ref/source/ouch.cc b/crawl-ref/source/ouch.cc
index c5ac75f..87ed6a5 100644
--- a/crawl-ref/source/ouch.cc
+++ b/crawl-ref/source/ouch.cc
@@ -124,7 +124,11 @@ int check_your_resists(int hurted, beam_type flavour, string source,
}
if (doEffects)
+ {
+ // Applying effects requires an actual beam object.
+ ASSERT(beam);
_maybe_melt_player_enchantments(flavour, hurted);
+ }
switch (flavour)
{
--
1.8.5.2 (Apple Git-48)
beam_assert_3.patch [^] (1,266 bytes) 2014-04-23 23:07 [Show Content] [Hide Content]diff --git a/crawl-ref/source/ouch.cc b/crawl-ref/source/ouch.cc
index c5ac75f..ba7b513 100644
--- a/crawl-ref/source/ouch.cc
+++ b/crawl-ref/source/ouch.cc
@@ -201,6 +201,10 @@ int check_your_resists(int hurted, beam_type flavour, string source,
case BEAM_POISON:
if (doEffects)
{
+ // Ensure that we received a valid beam object before proceeding.
+ // See also melee_attack.cc:_print_resist_messages() which cannot be
+ // used with this beam type (as it does not provide a valid beam).
+ ASSERT(beam);
int pois = div_rand_round(beam->damage.num * beam->damage.size, 3);
pois = 3 + random_range(pois * 2 / 3, pois * 4 / 3);
@@ -227,6 +231,10 @@ int check_your_resists(int hurted, beam_type flavour, string source,
if (doEffects)
{
+ // Ensure that we received a valid beam object before proceeding.
+ // See also melee_attack.cc:_print_resist_messages() which cannot be
+ // used with this beam type (as it does not provide a valid beam).
+ ASSERT(beam);
int pois = div_rand_round(beam->damage.num * beam->damage.size, 3);
pois = 3 + random_range(pois * 2 / 3, pois * 4 / 3);
|
