From b1335014e55ee53fbfebb5fc5fd7a93aa649332a Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Tue, 29 Jul 2008 06:34:33 +0000 Subject: [PATCH 1/1] 2008-07-29 [colin] 3.5.0cvs37 * src/news.c Fix bug 1684, 'view news messages with large attachements segfaults' --- ChangeLog | 6 ++++++ PATCHSETS | 1 + configure.ac | 2 +- src/news.c | 2 +- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7d64f3dcf..4391d4227 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-07-29 [colin] 3.5.0cvs37 + + * src/news.c + Fix bug 1684, 'view news messages with large + attachements segfaults' + 2008-07-29 [colin] 3.5.0cvs36 * src/action.c diff --git a/PATCHSETS b/PATCHSETS index 82829297d..cbac6656f 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -3448,3 +3448,4 @@ ( cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/addrcustomattr.c; cvs diff -u -r 1.60.2.119 -r 1.60.2.120 src/addressbook.c; cvs diff -u -r 1.382.2.457 -r 1.382.2.458 src/compose.c; cvs diff -u -r 1.14.2.50 -r 1.14.2.51 src/editaddress.c; cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/editaddress_other_attributes_ldap.h; cvs diff -u -r 1.1.2.17 -r 1.1.2.18 src/edittags.c; cvs diff -u -r 1.274.2.256 -r 1.274.2.257 src/mainwindow.c; cvs diff -u -r 1.83.2.136 -r 1.83.2.137 src/mimeview.c; cvs diff -u -r 1.60.2.59 -r 1.60.2.60 src/prefs_actions.c; cvs diff -u -r 1.59.2.70 -r 1.59.2.71 src/prefs_filtering.c; cvs diff -u -r 1.12.2.64 -r 1.12.2.65 src/prefs_template.c; cvs diff -u -r 1.395.2.375 -r 1.395.2.376 src/summaryview.c; cvs diff -u -r 1.96.2.202 -r 1.96.2.203 src/textview.c; cvs diff -u -r 1.12.2.22 -r 1.12.2.23 src/textview.h; cvs diff -u -r 1.43.2.102 -r 1.43.2.103 src/toolbar.c; cvs diff -u -r 1.4.2.64 -r 1.4.2.65 src/gtk/about.c; cvs diff -u -r 1.5.2.29 -r 1.5.2.30 src/gtk/menu.c; cvs diff -u -r 1.4.2.14 -r 1.4.2.15 src/gtk/menu.h; cvs diff -u -r 1.14.2.64 -r 1.14.2.65 src/plugins/trayicon/trayicon.c; ) > 3.5.0cvs34.patchset ( cvs diff -u -r 1.5.2.30 -r 1.5.2.31 src/gtk/menu.c; cvs diff -u -r 1.4.2.15 -r 1.4.2.16 src/gtk/menu.h; ) > 3.5.0cvs35.patchset ( cvs diff -u -r 1.12.2.50 -r 1.12.2.51 src/action.c; cvs diff -u -r 1.3.2.8 -r 1.3.2.9 src/action.h; cvs diff -u -r 1.60.2.120 -r 1.60.2.121 src/addressbook.c; cvs diff -u -r 1.5.2.8 -r 1.5.2.9 src/addressitem.h; cvs diff -u -r 1.382.2.458 -r 1.382.2.459 src/compose.c; cvs diff -u -r 1.50.2.47 -r 1.50.2.48 src/compose.h; cvs diff -u -r 1.94.2.181 -r 1.94.2.182 src/messageview.c; cvs diff -u -r 1.19.2.19 -r 1.19.2.20 src/messageview.h; cvs diff -u -r 1.395.2.376 -r 1.395.2.377 src/summaryview.c; cvs diff -u -r 1.5.2.31 -r 1.5.2.32 src/gtk/menu.c; cvs diff -u -r 1.4.2.16 -r 1.4.2.17 src/gtk/menu.h; ) > 3.5.0cvs36.patchset +( cvs diff -u -r 1.101.2.52 -r 1.101.2.53 src/news.c; ) > 3.5.0cvs37.patchset diff --git a/configure.ac b/configure.ac index 85b79d3a9..286c74675 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=5 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=36 +EXTRA_VERSION=37 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/news.c b/src/news.c index 7d1a87fd2..b9947a028 100644 --- a/src/news.c +++ b/src/news.c @@ -712,9 +712,9 @@ static gint news_get_article(Folder *folder, gint num, gchar *filename) if (r == NEWSNNTP_NO_ERROR) { if (str_write_to_file(result, filename) < 0) return -1; + g_free(result); } - g_free(result); return r; } -- 2.25.1