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

(prunits, prplanes): Simplify, compute relation string instead of

Browse source 
format.

(prplanes): Fix dangerous misuse of pr(): passed formatted string
instead of format string and arguments.  Crash bug if formatted string
contains '%'.  Players can put that in country names...
This commit is contained in:
Markus Armbruster 2006-03-26 12:54:52 +00:00
parent 7b4a164d0a
commit ade364fa1d
1 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/lib/commands/spy.c
View file

@ -296,7 +296,7 @@ prunits(int x, int y)
{ {
struct lndstr land; struct lndstr land;
struct nstr_item ni; struct nstr_item ni;
s_char report[128]; char report[128];
snxtitem_xy(&ni, EF_LAND, x, y); snxtitem_xy(&ni, EF_LAND, x, y);
while (nxtitem(&ni, &land)) { while (nxtitem(&ni, &land)) {
@ -311,16 +311,17 @@ prunits(int x, int y)
} }
if ((land.lnd_own != player->cnum) && land.lnd_own) { if ((land.lnd_own != player->cnum) && land.lnd_own) {
int rel; int rel;
s_char *format; char *relstr;
rel = getrel(getnatp(player->cnum), land.lnd_own); rel = getrel(getnatp(player->cnum), land.lnd_own);
if (rel == ALLIED) if (rel == ALLIED)
format = "Allied (%s) unit in %s: "; relstr = "Allied";
else if (rel == FRIENDLY || rel == NEUTRAL) else if (rel == FRIENDLY || rel == NEUTRAL)
format = "Neutral (%s) unit in %s: "; relstr = "Neutral";
else else
format = "Enemy (%s) unit in %s: "; relstr = "Enemy";
sprintf(report, format, cname(land.lnd_own), sprintf(report, "%s (%s) unit in %s: ",
relstr, cname(land.lnd_own),
xyas(land.lnd_x, land.lnd_y, player->cnum)); xyas(land.lnd_x, land.lnd_y, player->cnum));
intelligence_report(player->cnum, &land, 3, report); intelligence_report(player->cnum, &land, 3, report);
} }
@ -332,7 +333,6 @@ prplanes(int x, int y)
{ {
struct plnstr plane; struct plnstr plane;
struct nstr_item ni; struct nstr_item ni;
s_char report[128];
snxtitem_xy(&ni, EF_PLANE, x, y); snxtitem_xy(&ni, EF_PLANE, x, y);
while (nxtitem(&ni, &plane)) { while (nxtitem(&ni, &plane)) {
@ -344,19 +344,19 @@ prplanes(int x, int y)
continue; continue;
if ((plane.pln_own != player->cnum) && plane.pln_own) { if ((plane.pln_own != player->cnum) && plane.pln_own) {
int rel; int rel;
s_char *format; char *relstr;
rel = getrel(getnatp(player->cnum), plane.pln_own); rel = getrel(getnatp(player->cnum), plane.pln_own);
if (rel == ALLIED) if (rel == ALLIED)
format = "Allied (%s) plane in %s: %s\n"; relstr = "Allied";
else if (rel == FRIENDLY || rel == NEUTRAL) else if (rel == FRIENDLY || rel == NEUTRAL)
format = "Neutral (%s) plane in %s: %s\n"; relstr = "Neutral";
else else
format = "Enemy (%s) plane in %s: %s\n"; relstr = "Enemy";
sprintf(report, format, cname(plane.pln_own), pr("%s (%s) plane in %s: %s\n",
relstr, cname(plane.pln_own),
xyas(plane.pln_x, plane.pln_y, player->cnum), xyas(plane.pln_x, plane.pln_y, player->cnum),
prplane(&plane)); prplane(&plane));
pr(report);
} }
} }
} }