fluidB
/
webdiss
1
0
Fork 0
Code Pull Requests Activity

CodeQL: Poorly documented large function

Browse Source 
Document conf_read a bit more, and add some error reporting + 2 missing
free() calls. The leak was insignificant, only happening once at
startup.
master
Jessie Murray 3 years ago committed by Nicolas Favre-Felix
parent d2b115616f
commit 3aaeabfcd3
No known key found for this signature in database
GPG Key ID: C04E7AA8B6F73372
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File

28
src/conf.c
Unescape Escape View File

@ -110,9 +110,9 @@ conf_read(const char *filename) {
} else if(strcmp(json_object_iter_key(kv), "redis_port") == 0 && json_typeof(jtmp) == JSON_STRING) {
conf->redis_port = atoi_free(conf_string_or_envvar(json_string_value(jtmp)));
} else if(strcmp(json_object_iter_key(kv), "redis_auth") == 0) {
if(json_typeof(jtmp) == JSON_STRING) {
if(json_typeof(jtmp) == JSON_STRING) { /* single password, potentially from env var */
conf->redis_auth = conf_auth_legacy(conf_string_or_envvar(json_string_value(jtmp)));
} else if(json_typeof(jtmp) == JSON_ARRAY) {
} else if(json_typeof(jtmp) == JSON_ARRAY) { /* pair of username and password, new in Redis 6 */
conf->redis_auth = conf_auth_username_password(jtmp);
} else if(json_typeof(jtmp) != JSON_NULL) {
fprintf(stderr, ACL_ERROR_PREFIX "expected a string or an array of two strings" ACL_ERROR_SUFFIX);
@ -123,7 +123,7 @@ conf_read(const char *filename) {
} else if(strcmp(json_object_iter_key(kv), "http_port") == 0 && json_typeof(jtmp) == JSON_INTEGER) {
conf->http_port = (int)json_integer_value(jtmp);
} else if(strcmp(json_object_iter_key(kv), "http_port") == 0 && json_typeof(jtmp) == JSON_STRING) {
conf->http_port = atoi_free(conf_string_or_envvar(json_string_value(jtmp)));
conf->http_port = atoi_free(conf_string_or_envvar(json_string_value(jtmp))); /* Redis port in env. variable */
} else if(strcmp(json_object_iter_key(kv), "http_max_request_size") == 0 && json_typeof(jtmp) == JSON_INTEGER) {
conf->http_max_request_size = (size_t)json_integer_value(jtmp);
} else if(strcmp(json_object_iter_key(kv), "http_max_request_size") == 0 && json_typeof(jtmp) == JSON_STRING) {
@ -131,19 +131,35 @@ conf_read(const char *filename) {
} else if(strcmp(json_object_iter_key(kv), "threads") == 0 && json_typeof(jtmp) == JSON_INTEGER) {
conf->http_threads = (int)json_integer_value(jtmp);
} else if(strcmp(json_object_iter_key(kv), "threads") == 0 && json_typeof(jtmp) == JSON_STRING) {
conf->http_threads = atoi_free(conf_string_or_envvar(json_string_value(jtmp)));
conf->http_threads = atoi_free(conf_string_or_envvar(json_string_value(jtmp))); /* threads in env. variable */
} else if(strcmp(json_object_iter_key(kv), "acl") == 0 && json_typeof(jtmp) == JSON_ARRAY) {
conf->perms = conf_parse_acls(jtmp);
} else if(strcmp(json_object_iter_key(kv), "user") == 0 && json_typeof(jtmp) == JSON_STRING) {
struct passwd *u;
if((u = getpwnam(conf_string_or_envvar(json_string_value(jtmp))))) {
char *username = conf_string_or_envvar(json_string_value(jtmp));
errno = 0; /* required before calling getpwnam if we want to distinguish b/w not found and error */
if((u = getpwnam(username))) {
conf->user = u->pw_uid;
} else if (errno) { /* an error happened while we looked up this user */
fprintf(stderr, "Could not find user ID for user '%s', an error occurred: %s\n",
username, strerror(errno));
} else {
fprintf(stderr, "Could not find user ID for unknown user '%s'\n", username);
}
free(username);
} else if(strcmp(json_object_iter_key(kv), "group") == 0 && json_typeof(jtmp) == JSON_STRING) {
struct group *g;
if((g = getgrnam(conf_string_or_envvar(json_string_value(jtmp))))) {
char *groupname = conf_string_or_envvar(json_string_value(jtmp));
errno = 0; /* required before calling getgrnam if we want to distinguish b/w not found and error */
if((g = getgrnam(groupname))) {
conf->group = g->gr_gid;
} else if (errno) { /* an error happened while we looked up this group */
fprintf(stderr, "Could not find group ID for group '%s', an error occurred: %s\n",
groupname, strerror(errno));
} else {
fprintf(stderr, "Could not find group ID for unknown group '%s'\n", groupname);
}
free(groupname);
} else if(strcmp(json_object_iter_key(kv),"logfile") == 0 && json_typeof(jtmp) == JSON_STRING){
conf->logfile = conf_string_or_envvar(json_string_value(jtmp));
} else if(strcmp(json_object_iter_key(kv),"log_fsync") == 0) {

Write Preview
Loading…
Cancel
Save