diff --git a/doc/fixes34.2 b/doc/fixes34.2 index be3c90e55..049ef0fe0 100644 --- a/doc/fixes34.2 +++ b/doc/fixes34.2 @@ -55,6 +55,8 @@ prevent several QBUFSZ sized buffers from overflowing and triggering fatal make sure that leashed monsters are released prior to shopkeeper inheriting dead character's inventory attaching long named candle to long named candelabrum caused buffer overflow +when polymorhed, only hand/weapon attack on disenchanter should result in + damage to weapon, gloves, etc. Platform- and/or Interface-Specific Fixes diff --git a/src/uhitm.c b/src/uhitm.c index 1cff1de09..bb0454c86 100644 --- a/src/uhitm.c +++ b/src/uhitm.c @@ -2236,6 +2236,9 @@ uchar aatyp; if (aatyp == AT_KICK) { obj = uarmf; if (!obj) break; + } else if (aatyp == AT_BITE || aatyp == AT_BUTT || + (aatyp >= AT_STNG && aatyp < AT_WEAP)) { + break; /* no object involved */ } passive_obj(mon, obj, &(ptr->mattk[i])); }