Fix segmentation fault when NULL err_msg pointer passed to capture_interface_list() and sync_list_interface_open() fails.

svn path=/trunk/; revision=22073

1 files changed, 8 insertions, 4 deletions

diff --git a/capture.c b/capture.c
index f3cdee6e16..c0e918a70a 100644
--- a/capture.c
+++ b/capture.c
@@ -602,12 +602,16 @@ capture_interface_list(int *err, char **err_str)
 
     /* Try to get our interface list */
     *err = sync_interface_list_open(&msg);
-    if(*err != 0) {
+    if (*err != 0) {
         g_log(LOG_DOMAIN_CAPTURE, G_LOG_LEVEL_MESSAGE, "Capture Interface List failed!");
-        if (*err_str)
-            *err_str = msg;
-        else
+        if (err_str) {
+            if (*err_str)
+                *err_str = msg;
+            else
+                g_free(msg);
+        } else {
             g_free(msg);
+        }
         return NULL;
     }