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

Fix add not to crash on negative country number

Browse source
This commit is contained in:
Markus Armbruster 2011-11-06 19:09:26 +01:00
parent b36727e7fb
commit 881b6fbd2b
1 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/lib/commands/add.c
View file

@ -42,7 +42,6 @@ add(void)
int i; int i;
char cntryname[sizeof(natp->nat_cnam)]; char cntryname[sizeof(natp->nat_cnam)];
char pname[sizeof(natp->nat_pnam)]; char pname[sizeof(natp->nat_pnam)];
natid coun;
natid freecn; natid freecn;
char prompt[128]; char prompt[128];
char buf[1024]; char buf[1024];
@ -61,20 +60,19 @@ add(void)
if (!p || !*p) if (!p || !*p)
return RET_SYN; return RET_SYN;
i = atoi(p); i = atoi(p);
if (i >= MAXNOC) { if (i == 0) {
pr("Max # countries is %d\n", MAXNOC);
return RET_FAIL;
}
coun = i;
if (coun == 0) {
pr("Not allowed to add country #0\n"); pr("Not allowed to add country #0\n");
return RET_FAIL; return RET_FAIL;
} }
natp = getnatp(coun); natp = getnatp(i);
if (!natp) {
pr("Can't add country #%d\n", i);
return RET_FAIL;
}
p = getstarg(player->argp[2], "Country name? ", buf); p = getstarg(player->argp[2], "Country name? ", buf);
if (!p) if (!p)
return RET_SYN; return RET_SYN;
if (!check_nat_name(p, coun)) if (!check_nat_name(p, natp->nat_cnum))
return RET_FAIL; return RET_FAIL;
strcpy(cntryname, p); strcpy(cntryname, p);
p = getstarg(player->argp[3], "Representative? ", buf); p = getstarg(player->argp[3], "Representative? ", buf);