colin/wireplumber
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

log: accept 0 as a level and do safety checks on the level string

Browse Source
This commit is contained in:
George Kiagiadakis
2023-05-19 10:50:46 +03:00
parent 4f27d18bd3
commit 3034fc7c79
1 changed files with 28 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
lib/wp/log.c
View File

@@ -299,17 +299,26 @@ level_index_to_spa (gint lvl_index)
return log_level_info [lvl_index].spa_level; return log_level_info [lvl_index].spa_level;
} }
static gint static gboolean
level_index_from_string (const char *str) level_index_from_string (const char *str, gint *lvl)
{ {
g_return_val_if_fail (str != NULL, 0); g_return_val_if_fail (str != NULL, FALSE);
for (guint i = 0; i < G_N_ELEMENTS (log_level_info); i++) { /* level is always 1 character */
if (g_str_equal (str, log_level_info[i].name)) if (str[0] != '\0' && str[1] == '\0') {
return i; for (guint i = 1; i < G_N_ELEMENTS (log_level_info); i++) {
if (str[0] == log_level_info[i].name[0]) {
*lvl = i;
return TRUE;
}
}
if (str[0] >= '0' && str[0] <= '5') {
*lvl = level_index_from_spa (str[0] - '0');
return TRUE;
}
} }
return FALSE;
return level_index_from_spa (atoi (str));
} }
/* private, called from wp_init() */ /* private, called from wp_init() */
@@ -344,11 +353,11 @@ wp_log_init (gint flags)
gint lvl; gint lvl;
tok = pw_split_strv (tokens[i], ":", 2, &n_tok); tok = pw_split_strv (tokens[i], ":", 2, &n_tok);
if (n_tok == 2 && (lvl = level_index_from_string (tok[1]))) { if (n_tok == 2 && level_index_from_string (tok[1], &lvl)) {
pttrn->spec = g_pattern_spec_new (tok[0]); pttrn->spec = g_pattern_spec_new (tok[0]);
pttrn->log_level = lvl; pttrn->log_level = lvl;
pttrn++; pttrn++;
} else if (n_tok == 1 && (lvl = level_index_from_string (tok[0]))) { } else if (n_tok == 1 && level_index_from_string (tok[0], &lvl)) {
global_log_level = lvl; global_log_level = lvl;
} else { } else {
/* note that this is going to initialize the wp-log topic here */ /* note that this is going to initialize the wp-log topic here */
@@ -401,11 +410,15 @@ wp_log_init (gint flags)
void void
wp_log_set_global_level (const gchar *log_level) wp_log_set_global_level (const gchar *log_level)
{ {
gint level = level_index_from_string (log_level); gint level;
log_state.global_log_level = level; if (level_index_from_string (log_level, &level)) {
log_state.global_log_level_flags = level_index_to_full_flags (level); log_state.global_log_level = level;
wp_spa_log_get_instance()->level = level_index_to_spa (level); log_state.global_log_level_flags = level_index_to_full_flags (level);
pw_log_set_level (level_index_to_spa (level)); wp_spa_log_get_instance()->level = level_index_to_spa (level);
pw_log_set_level (level_index_to_spa (level));
} else {
wp_warning ("ignoring invalid log.level in config file: %s", log_level);
}
} }
static gint static gint