osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

From Cal Turney: 

Preferences with trailing commas are ignored.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8707

svn path=/trunk/; revision=49629
This commit is contained in:
Anders Broman 2013-05-30 05:30:08 +00:00
parent af28c2b9eb
commit aff9b07fd3
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
epan/prefs.c
View File

@ -3009,6 +3009,13 @@ read_prefs_file(const char *pf_path, FILE *pf,
if (isalnum(got_c)) {
if (cur_var->len > 0) {
if (got_val) {
if (cur_val->str[strlen(cur_val->str)-1] == ',') {
/*
* If the pref has a trailing comma, eliminate it.
*/
cur_val->str[strlen(cur_val->str)-1] = '\0';
g_warning ("%s line %d: trailing comma in \"%s\" %s", pf_path, pline, cur_var->str, hint);
}
/* Call the routine to set the preference; it will parse
the value as appropriate. */
switch (pref_set_pair_fct(cur_var->str, cur_val->str, private_data, FALSE)) {
@ -3017,7 +3024,8 @@ read_prefs_file(const char *pf_path, FILE *pf,
break;
case PREFS_SET_SYNTAX_ERR:
g_warning ("%s line %d: Syntax error in preference %s %s", pf_path, pline, cur_var->str, hint);
g_warning ("%s line %d: Syntax error in preference \"%s\" %s",
pf_path, pline, cur_var->str, hint);
break;
case PREFS_SET_NO_SUCH_PREF: