diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2016-09-18 09:31:01 +0200 |
|---|---|---|
| committer | Roland Knall <rknall@gmail.com> | 2016-09-18 09:01:08 +0000 |
| commit | 66203b4f31e69187636d2dfc0562bc0ccc5a7173 (patch) | |
| tree | 83e7b2ae64692bbc881b0b2d0c4cff641385f1db /extcap.c | |
| parent | a978ad7ce3022fb7930ede81f4dd72a69bc6018a (diff) | |
| download | wireshark-66203b4f31e69187636d2dfc0562bc0ccc5a7173.tar.gz | |
extcap: fix management of multicheck and saved non boolean arguments
Launching USBPcap without going in the interface options menu exhibits 2 bugs:
- we should restore a value only if it is not an empty string (otherwise USBPcap with an ampty --devices multicheck argument)
- when building the argument list for a non boolean argument not using the default value, do not call g_strconcat. It will
build a string concatenating the option and value (for example "--devices 1" that will be treated as a single argument).
Instead option and value must be given separately to argument list.
Bug: 12846
Change-Id: I5628cb264a7632089e6579e9ae7400e2c0e500e2
Reviewed-on: https://code.wireshark.org/review/17773
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
Diffstat (limited to 'extcap.c')
| -rw-r--r-- | extcap.c | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -618,7 +618,7 @@ static gboolean search_cb(const gchar *extcap _U_, const gchar *ifname _U_, gcha pref_title, pref_title, (const char **)arg->pref_valptr); } else { /* Been here before, restore stored value */ - if (! arg->pref_valptr && pref->varp.string) + if (! arg->pref_valptr && pref->varp.string && strlen(*pref->varp.string)) { arg->pref_valptr = pref->varp.string; } @@ -1010,9 +1010,8 @@ GPtrArray * extcap_prepare_arguments(interface_options interface_opts) if ( g_strcmp0(stored, "true") == 0 ) add_arg(arg_iter->call); } else { - gchar * call = g_strconcat(arg_iter->call, " ", stored, NULL); - add_arg(call); - g_free(call); + add_arg(arg_iter->call); + add_arg(stored); } } else if (arg_iter->arg_type == EXTCAP_ARG_BOOLFLAG) { if (extcap_complex_get_bool(arg_iter->default_complex)) |