2011-01-25 [colin] 3.7.8cvs45

	* src/pop.c
		Fix leak on error path

diff --git a/ChangeLog b/ChangeLog
index 7acb5304b2d84657a74eafba8d2a91d11d348f1d..d174c0607af03e51a04e57bf87fb6d1b11c0019b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-25 [colin]     3.7.8cvs45
+
+       * src/pop.c
+               Fix leak on error path
+

 2011-01-23 [mones]     3.7.8cvs44
 
        * manual/es/advanced.xml
 2011-01-23 [mones]     3.7.8cvs44
 
        * manual/es/advanced.xml

diff --git a/PATCHSETS b/PATCHSETS
index 830e18b4f32e59577efd25db266e0ace6d83327b..77f5153719a650f7665d166b229c35058fc92794 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4118,3 +4118,4 @@
 ( cvs diff -u -r 1.1.2.54 -r 1.1.2.55 manual/advanced.xml;  cvs diff -u -r 1.204.2.198 -r 1.204.2.199 src/prefs_common.c;  cvs diff -u -r 1.103.2.130 -r 1.103.2.131 src/prefs_common.h;  cvs diff -u -r 1.96.2.229 -r 1.96.2.230 src/textview.c;  ) > 3.7.8cvs42.patchset
 ( cvs diff -u -r 1.4.2.77 -r 1.4.2.78 src/gtk/about.c;  ) > 3.7.8cvs43.patchset
 ( cvs diff -u -r 1.1.2.16 -r 1.1.2.17 manual/es/advanced.xml;  ) > 3.7.8cvs44.patchset
 ( cvs diff -u -r 1.1.2.54 -r 1.1.2.55 manual/advanced.xml;  cvs diff -u -r 1.204.2.198 -r 1.204.2.199 src/prefs_common.c;  cvs diff -u -r 1.103.2.130 -r 1.103.2.131 src/prefs_common.h;  cvs diff -u -r 1.96.2.229 -r 1.96.2.230 src/textview.c;  ) > 3.7.8cvs42.patchset
 ( cvs diff -u -r 1.4.2.77 -r 1.4.2.78 src/gtk/about.c;  ) > 3.7.8cvs43.patchset
 ( cvs diff -u -r 1.1.2.16 -r 1.1.2.17 manual/es/advanced.xml;  ) > 3.7.8cvs44.patchset

+( cvs diff -u -r 1.56.2.66 -r 1.56.2.67 src/pop.c;  ) > 3.7.8cvs45.patchset

diff --git a/configure.ac b/configure.ac
index 38e2b6722802471f7a1cb2f41afcbe2234b00a5a..30594e1df5e5c7b451b3baa9b16f392d29e83810 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=8
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=8
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=44
+EXTRA_VERSION=45

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/pop.c b/src/pop.c
index ad2d2b4aba5fd368fa4b06fc97e4f0c8fff5fecb..35f0d40e6fcaa1a29ef7feaa585e89fbe0c49c19 100644 (file)
--- a/src/pop.c
+++ b/src/pop.c
@@ -664,9 +664,11 @@ gint pop3_write_uidl_list(Pop3Session *session)
        gchar *sanitized_uid = g_strdup(session->ac_prefs->userid);
        
        subst_for_filename(sanitized_uid);
        gchar *sanitized_uid = g_strdup(session->ac_prefs->userid);
        
        subst_for_filename(sanitized_uid);

-       

 
 

-       if (!session->uidl_is_valid) return 0;
+       if (!session->uidl_is_valid) {
+               g_free(sanitized_uid);
+               return 0;
+       }

 
        path = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
                           "uidl", G_DIR_SEPARATOR_S,
 
        path = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
                           "uidl", G_DIR_SEPARATOR_S,