aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2012-05-29 07:27:35 +0000
committerAnders Broman <anders.broman@ericsson.com>2012-05-29 07:27:35 +0000
commitfa11167ea1e93d85408974f8cb6f0aff486dfc26 (patch)
treedd48d1937efd626f39026f24ad8e3e4c7941d18e
parent1660e397b9531c681a6747f8e37ee481630db33c (diff)
downloadwireshark-fa11167ea1e93d85408974f8cb6f0aff486dfc26.tar.gz
wireshark-fa11167ea1e93d85408974f8cb6f0aff486dfc26.tar.bz2
wireshark-fa11167ea1e93d85408974f8cb6f0aff486dfc26.zip
From Evan Huus:
Misc resource leaks. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7296 svn path=/trunk/; revision=42892
-rw-r--r--ui/gtk/graph_analysis.c5
-rw-r--r--update.c1
2 files changed, 5 insertions, 1 deletions
diff --git a/ui/gtk/graph_analysis.c b/ui/gtk/graph_analysis.c
index 86d7fa02fa..3a4bf9bd7f 100644
--- a/ui/gtk/graph_analysis.c
+++ b/ui/gtk/graph_analysis.c
@@ -812,7 +812,10 @@ static void dialog_graph_draw(graph_analysis_data_t *user_data)
last_item = first_item+display_items-1;
/* if no items to display */
- if (display_items == 0) return;
+ if (display_items == 0) {
+ g_free(time_str);
+ return;
+ }
/* Calculate the x borders */
diff --git a/update.c b/update.c
index 4282bd8816..49dd2b968a 100644
--- a/update.c
+++ b/update.c
@@ -83,6 +83,7 @@ download_file(const char *url, const char *filename) {
/* connect to url */
conn = netio_ie5_connect (url);
if (conn == NULL) {
+ ws_close(fd);
g_warning("Couldn't connect to %s!", url);
return -1;
}