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

fix a crash for invalid race enums

This commit is contained in:
Enno Rehling 2014-06-29 19:15:03 -07:00
parent 12661fc373
commit 9dcf5bbf4c
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/kernel/race.c
View File

@ -81,17 +81,21 @@ static race * race_cache[MAXRACES];
struct race *get_race(race_t rt) { struct race *get_race(race_t rt) {
static int cache = -1; static int cache = -1;
const char * name;
assert(rt < MAXRACES);
name = racenames[rt];
if (!name) {
return 0;
}
if (cache_breaker != cache) { if (cache_breaker != cache) {
cache = cache_breaker; cache = cache_breaker;
memset(race_cache, 0, sizeof(race_cache)); memset(race_cache, 0, sizeof(race_cache));
assert(rt < MAXRACES); return race_cache[rt] = rc_get_or_create(name);
if (racenames[rt]) {
return race_cache[rt] = rc_get_or_create(racenames[rt]);
}
} else { } else {
race * result = race_cache[rt]; race * result = race_cache[rt];
if (!result) { if (!result) {
result = race_cache[rt] = rc_get_or_create(racenames[rt]); result = race_cache[rt] = rc_get_or_create(name);
} }
return result; return result;
} }
@ -171,7 +175,10 @@ const race * rc_find(const char *name) {
race *rc_get_or_create(const char *zName) race *rc_get_or_create(const char *zName)
{ {
race *rc = rc_find_i(zName); race *rc;
assert(zName);
rc = rc_find_i(zName);
if (!rc) { if (!rc) {
char zBuffer[80]; char zBuffer[80];