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

fix gcc build, introduce a hard limit on ini section size

This commit is contained in:
Enno Rehling 2017-01-21 20:39:46 +01:00
parent ebbe4fa4ac
commit 75a97c2977
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/kernel/config.c
View File

@ -721,15 +721,12 @@ void config_set_from(const dictionary *d)
char key[128]; char key[128];
const char *sec = iniparser_getsecname(d, s); const char *sec = iniparser_getsecname(d, s);
int k, nkeys = iniparser_getsecnkeys(d, sec); int k, nkeys = iniparser_getsecnkeys(d, sec);
char *akeys[MAXKEYS]; const char *keys[MAXKEYS];
char ** keys = akeys;
size_t slen = strlen(sec); size_t slen = strlen(sec);
assert(nkeys <= MAXKEYS);
assert(slen<sizeof(key)); assert(slen<sizeof(key));
memcpy(key, sec, slen); memcpy(key, sec, slen);
key[slen] = '.'; key[slen] = '.';
if (nkeys>MAXKEYS) {
keys = malloc(sizeof(const char *) * nkeys);
}
iniparser_getseckeys(d, sec, keys); iniparser_getseckeys(d, sec, keys);
for (k=0;k!=nkeys;++k) { for (k=0;k!=nkeys;++k) {
const char *val; const char *val;
@ -741,9 +738,6 @@ void config_set_from(const dictionary *d)
config_set(key, val); config_set(key, val);
} }
} }
if (keys!=akeys) {
free(keys);
}
} }
} }