nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

(Re-)initialize optional fields to empty strings

This commit is contained in:
Michael Stapelberg 2017-08-20 12:55:55 +02:00
parent c25bee0ffc
commit dd019f59fa
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/config_parser.c
View File

@ -916,6 +916,7 @@ bool parse_file(const char *f, bool use_nagbar) {
} }
/* sscanf implicitly strips whitespace. */ /* sscanf implicitly strips whitespace. */
value[0] = '\0';
const bool skip_line = (sscanf(buffer, "%511s %4095[^\n]", key, value) < 1 || strlen(key) < 3); const bool skip_line = (sscanf(buffer, "%511s %4095[^\n]", key, value) < 1 || strlen(key) < 3);
const bool comment = (key[0] == '#'); const bool comment = (key[0] == '#');
value[4095] = '\n'; value[4095] = '\n';
@ -938,7 +939,7 @@ bool parse_file(const char *f, bool use_nagbar) {
if (strcasecmp(key, "set") == 0) { if (strcasecmp(key, "set") == 0) {
char v_key[512]; char v_key[512];
char v_value[4096]; char v_value[4096] = {'\0'};
if (sscanf(value, "%511s %4095[^\n]", v_key, v_value) < 1) { if (sscanf(value, "%511s %4095[^\n]", v_key, v_value) < 1) {
ELOG("Failed to parse variable specification '%s', skipping it.\n", value); ELOG("Failed to parse variable specification '%s', skipping it.\n", value);
@ -953,9 +954,9 @@ bool parse_file(const char *f, bool use_nagbar) {
upsert_variable(&variables, v_key, v_value); upsert_variable(&variables, v_key, v_value);
continue; continue;
} else if (strcasecmp(key, "set_from_resource") == 0) { } else if (strcasecmp(key, "set_from_resource") == 0) {
char res_name[512]; char res_name[512] = {'\0'};
char v_key[512]; char v_key[512];
char fallback[4096]; char fallback[4096] = {'\0'};
/* Ensure that this string is terminated. For example, a user might /* Ensure that this string is terminated. For example, a user might
* want a variable to be empty if the resource can't be found and * want a variable to be empty if the resource can't be found and