From ee53725a21cce1825bb3867ce3ca30cfcb1fb75b Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Tue, 23 May 2006 06:04:55 +0000 Subject: [PATCH] (prmptrd, uprmptrd): Oops on null prompt. getstarg() is sometimes called with a null prompt when it is believed not to use it, and that belief is sometimes wrong. Other users could have similar bugs. Some systems (GNU, Windows) deal gracefully with printing null strings, others crash. --- src/lib/subs/pr.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/lib/subs/pr.c b/src/lib/subs/pr.c index 15c58b854..b2b043952 100644 --- a/src/lib/subs/pr.c +++ b/src/lib/subs/pr.c @@ -367,6 +367,9 @@ prmptrd(char *prompt, char *buf, int size) */ CANT_HAPPEN(player->aborted); + if (CANT_HAPPEN(!prompt)) + prompt = "? "; + pr_id(player, C_FLUSH, "%s\n", prompt); if ((r = recvclient(buf, size)) < 0) return r; @@ -396,6 +399,9 @@ uprmptrd(char *prompt, char *buf, int size) /* See prmptrd() */ CANT_HAPPEN(player->aborted); + if (CANT_HAPPEN(!prompt)) + prompt = "? "; + pr_id(player, C_FLUSH, "%s\n", prompt); if ((r = recvclient(buf, size)) < 0) return r; -- 2.43.0