Free up the err_info string returned by wtap_read() and

wtap_seek_read().

Clean up indentation.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25400 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/capinfos.c b/capinfos.c
index f6cf17baeb98ef2f48b28e3a6eb56bf43b8ee90f..d260d132c3ed6e696568dc940ebe1cf53a960a39 100644 (file)
--- a/capinfos.c
+++ b/capinfos.c
@@ -167,6 +167,7 @@ process_cap_file(wtap *wth, const char *filename)
     case WTAP_ERR_UNSUPPORTED_ENCAP:
     case WTAP_ERR_BAD_RECORD:
       fprintf(stderr, "(%s)\n", err_info);
+      g_free(err_info);
       break;
     }
     return 1;

diff --git a/editcap.c b/editcap.c
index 56a33ae4fd93df1642425417a5fc024e5da88082..8628c50e35008a28f793fc3962b8e8d1b7663c33 100644 (file)
--- a/editcap.c
+++ b/editcap.c
@@ -814,6 +814,7 @@ main(int argc, char *argv[])
       case WTAP_ERR_UNSUPPORTED_ENCAP:
       case WTAP_ERR_BAD_RECORD:
         fprintf(stderr, "(%s)\n", err_info);
+        g_free(err_info);
         break;
       }
     }

diff --git a/file.c b/file.c
index 4350c3702d6d606e9f1692ea240d48223b6c27c2..ed9c458e0613e0084d6e03011f134e0a2868319b 100644 (file)
--- a/file.c
+++ b/file.c
@@ -3794,15 +3794,17 @@ cf_read_error_message(int err, const gchar *err_info)
   switch (err) {
 
   case WTAP_ERR_UNSUPPORTED_ENCAP:
-      g_snprintf(errmsg_errno, sizeof(errmsg_errno),
+    g_snprintf(errmsg_errno, sizeof(errmsg_errno),
                "The file \"%%s\" has a packet with a network type that Wireshark doesn't support.\n(%s)",
                err_info);
-      break;
+    g_free(err_info);
+    break;
 
   case WTAP_ERR_BAD_RECORD:
     g_snprintf(errmsg_errno, sizeof(errmsg_errno),
             "An error occurred while reading from the file \"%%s\": %s.\n(%s)",
             wtap_strerror(err), err_info);
+    g_free(err_info);
     break;
 
   default: