extcap: fix use-after-free bug.
authorDario Lombardo <lomato@gmail.com>
Thu, 19 Dec 2019 10:43:26 +0000 (11:43 +0100)
committerTomasz Moń <desowin@gmail.com>
Thu, 19 Dec 2019 16:20:08 +0000 (16:20 +0000)
Regression introduced in g1cd1e36.

Change-Id: I85775ef86d9325d4f5bf811a5f52925a2cf0d387
Reviewed-on: https://code.wireshark.org/review/35503
Petri-Dish: Tomasz Moń <desowin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Tomasz Moń <desowin@gmail.com>
extcap.c

index d0e078ffb5dda69884207717aa19a88fcf1a5d72..a35ab8d214fbee747289838405e87d495477004c 100644 (file)
--- a/extcap.c
+++ b/extcap.c
@@ -1866,9 +1866,8 @@ process_new_extcap(const char *extcap, char *output)
     if (toolbar_entry && toolbar_entry->menu_title)
     {
         iface_toolbar_add(toolbar_entry);
-        if (!extcap_iface_toolbar_add(extcap, toolbar_entry))
+        if (extcap_iface_toolbar_add(extcap, toolbar_entry))
         {
-            extcap_free_toolbar(toolbar_entry);
             toolbar_entry = NULL;
         }
     }