empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(prmptrd, uprmptrd): Oops on null prompt. getstarg() is sometimes

Browse source 
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.
This commit is contained in:
Markus Armbruster 2006-05-23 06:04:55 +00:00
parent 93b6a54356
commit ee53725a21
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/lib/subs/pr.c
View file

@ -367,6 +367,9 @@ prmptrd(char *prompt, char *buf, int size)
*/ */
CANT_HAPPEN(player->aborted); CANT_HAPPEN(player->aborted);
if (CANT_HAPPEN(!prompt))
prompt = "? ";
pr_id(player, C_FLUSH, "%s\n", prompt); pr_id(player, C_FLUSH, "%s\n", prompt);
if ((r = recvclient(buf, size)) < 0) if ((r = recvclient(buf, size)) < 0)
return r; return r;
@ -396,6 +399,9 @@ uprmptrd(char *prompt, char *buf, int size)
/* See prmptrd() */ /* See prmptrd() */
CANT_HAPPEN(player->aborted); CANT_HAPPEN(player->aborted);
if (CANT_HAPPEN(!prompt))
prompt = "? ";
pr_id(player, C_FLUSH, "%s\n", prompt); pr_id(player, C_FLUSH, "%s\n", prompt);
if ((r = recvclient(buf, size)) < 0) if ((r = recvclient(buf, size)) < 0)
return r; return r;