diff options
author | Dario Lombardo <lomato@gmail.com> | 2016-08-01 22:01:27 +0200 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2016-08-02 04:16:45 +0000 |
commit | 867d7ca399a3832dec8c22f717442420a0a44665 (patch) | |
tree | 6b2d922f1c702ccc3493dd88cbd9ef8e824d6747 /extcap.c | |
parent | abe8e51dbfa220c0b77b5269e7237c8aacc66c56 (diff) |
extcap: add null check (CID 1364683).
Change-Id: I1d81d6f043fa695ed507cf733fffa832922a708c
Reviewed-on: https://code.wireshark.org/review/16832
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'extcap.c')
-rw-r--r-- | extcap.c | 33 |
1 files changed, 18 insertions, 15 deletions
@@ -751,26 +751,29 @@ void extcap_if_cleanup(capture_options * capture_opts, gchar ** errormsg) { } #endif - if ( userdata->extcap_stderr != NULL ) - overwrite_exitcode = TRUE; - - if ( overwrite_exitcode || userdata->exitcode != 0 ) + if ( userdata ) { - if ( userdata->extcap_stderr != 0 ) + if ( userdata->extcap_stderr != NULL ) + overwrite_exitcode = TRUE; + + if ( overwrite_exitcode || userdata->exitcode != 0 ) { - if ( *errormsg == NULL ) - *errormsg = g_strdup_printf("Error by extcap pipe: %s", userdata->extcap_stderr); - else + if ( userdata->extcap_stderr != 0 ) { - gchar * temp = g_strconcat ( *errormsg, "\nError by extcap pipe: " ,userdata->extcap_stderr, NULL ); - g_free(*errormsg); - *errormsg = temp; + if ( *errormsg == NULL ) + *errormsg = g_strdup_printf("Error by extcap pipe: %s", userdata->extcap_stderr); + else + { + gchar * temp = g_strconcat ( *errormsg, "\nError by extcap pipe: " ,userdata->extcap_stderr, NULL ); + g_free(*errormsg); + *errormsg = temp; + } + g_free (userdata->extcap_stderr ); } - g_free (userdata->extcap_stderr ); - } - userdata->extcap_stderr = NULL; - userdata->exitcode = 0; + userdata->extcap_stderr = NULL; + userdata->exitcode = 0; + } } if (interface_opts.extcap_child_watch > 0) |