From: nhmall Date: Tue, 21 Jan 2020 02:33:20 +0000 (-0500) Subject: Merge fixes from 'NetHack-3.6' into NetHack-3.7-Jan2020 X-Git-Tag: NetHack-3.7.0_WIP~5^2~10 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=36bb4334e83919cdf2f9b92cf0699662e402b57e;p=nethack Merge fixes from 'NetHack-3.6' into NetHack-3.7-Jan2020 --- 36bb4334e83919cdf2f9b92cf0699662e402b57e diff --cc src/pline.c index 4bf141950,24bdea211..28d5dd4be --- a/src/pline.c +++ b/src/pline.c @@@ -469,11 -493,15 +485,15 @@@ VA_DECL(const char *, s VA_START(s); VA_INIT(s, const char *); - if (program_state.in_impossible) + if (g.program_state.in_impossible) panic("impossible called impossible"); - program_state.in_impossible = 1; + g.program_state.in_impossible = 1; + #if !defined(NO_VSNPRINTF) + (void) vsnprintf(pbuf, sizeof pbuf, s, VA_ARGS); + #else Vsprintf(pbuf, s, VA_ARGS); + #endif pbuf[BUFSZ - 1] = '\0'; /* sanity */ paniclog("impossible", pbuf); if (iflags.debug_fuzzer)