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

null pointer handling for strlcpy

Browse source
This commit is contained in:
Enno Rehling 2019-04-25 16:31:35 +02:00
parent 692cdcea13
commit 2442aed1db
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gamedb.c
View file

@ -17,10 +17,12 @@ static int generate_factions(void *data, db_faction *results, int nresults)
faction **iter = (faction **)data;
for (i = 0; *iter && i != nresults; ++i) {
faction *f = *iter;
const char *pwhash;
results[i].p_uid = &f->uid;
results[i].no = f->no;
results[i].email = faction_getemail(f);
str_strlcpy(results[i].pwhash, faction_getpassword(f), sizeof(results[i].pwhash));
pwhash = faction_getpassword(f);
str_strlcpy(results[i].pwhash, pwhash ? pwhash : "", sizeof(results[i].pwhash));
*iter = f->next;
}
return i;