Marc/server
1
0
Fork 0
forked from github/server
Code Issues Pull requests Projects Releases Wiki Activity

Fix accidental parsing of empty strings (Bug 1917)

Browse source
This commit is contained in:
Enno Rehling 2012-05-26 11:29:27 -07:00
parent 707262c61d
commit 2103c1725e
2 changed files with 28 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gamecode/laws.c
View file

@ -2445,6 +2445,7 @@ static void reshow(unit * u, struct order *ord, const char *s, param_t p)
cmistake(u, ord, 285, MSG_EVENT); cmistake(u, ord, 285, MSG_EVENT);
break; break;
case NOPARAM: case NOPARAM:
if (s) {
/* check if it's an item */ /* check if it's an item */
itype = finditemtype(s, u->faction->locale); itype = finditemtype(s, u->faction->locale);
if (itype != NULL) { if (itype != NULL) {
@ -2474,6 +2475,7 @@ static void reshow(unit * u, struct order *ord, const char *s, param_t p)
if (rc != NULL && display_race(u->faction, u, rc)) { if (rc != NULL && display_race(u->faction, u, rc)) {
break; break;
} }
}
cmistake(u, ord, 21, MSG_EVENT); cmistake(u, ord, 21, MSG_EVENT);
break; break;
default: default:

2
src/kernel/config.c
View file

@ -1397,7 +1397,7 @@ param_t findparam(const char *s, const struct locale * lang)
char buffer[64]; char buffer[64];
char * str = transliterate(buffer, sizeof(buffer)-sizeof(int), s); char * str = transliterate(buffer, sizeof(buffer)-sizeof(int), s);
if (str) { if (str && *str) {
int i; int i;
const void * match; const void * match;
void **tokens = get_translations(lang, UT_PARAMS); void **tokens = get_translations(lang, UT_PARAMS);