rpms/sylpheed/F-8 sylpheed-2.4.7-ldap.patch, 1.1, 1.2 sylpheed.spec, 1.61, 1.62

[Michael Schwendt (mschwendt)]

Author: mschwendt

Update of /cvs/pkgs/rpms/sylpheed/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4693/F-8

Modified Files:
	sylpheed-2.4.7-ldap.patch sylpheed.spec 
Log Message:
* Mon Dec 17 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.4.7-4
- Upstreamed patch lead to discovery of similar memory leaks in syldap.c


sylpheed-2.4.7-ldap.patch:

Index: sylpheed-2.4.7-ldap.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sylpheed/F-8/sylpheed-2.4.7-ldap.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sylpheed-2.4.7-ldap.patch	2 Nov 2007 10:15:50 -0000	1.1
+++ sylpheed-2.4.7-ldap.patch	17 Dec 2007 15:01:53 -0000	1.2
@@ -1,21 +1,21 @@
 diff -Nur sylpheed-2.4.7-orig/src/syldap.c sylpheed-2.4.7/src/syldap.c
 --- sylpheed-2.4.7-orig/src/syldap.c	2006-08-31 10:21:21.000000000 +0200
-+++ sylpheed-2.4.7/src/syldap.c	2007-11-02 00:08:27.000000000 +0100
-@@ -602,11 +602,10 @@
++++ sylpheed-2.4.7/src/syldap.c	2007-12-17 15:50:27.000000000 +0100
+@@ -602,10 +602,10 @@
  			if( g_ascii_strcasecmp( attribute, SYLDAP_ATTR_DN ) == 0 ) {
  				listDN = syldap_add_single_value( ld, e, attribute );
  			}
-+			/* Free memory used to store attribute */
-+			ldap_memfree( attribute );
- 		}
+-		}
  
 -		/* Free memory used to store attribute */
 -		ldap_memfree( attribute );
--
++			/* Free memory used to store attribute */
++			ldap_memfree( attribute );
++		}
+ 
  		/* Format and add items to cache */
  		syldap_build_items_fl( ldapServer, listAddress, listFirst, listLast );
- 
-@@ -637,16 +636,15 @@
+@@ -637,16 +637,15 @@
  
  /* syldap_display_search_results() - updates the ui. this function is called from the
   * main thread (the thread running the GTK event loop). */
@@ -34,3 +34,43 @@
  }
  
  /* ============================================================================================ */
+@@ -821,8 +820,8 @@
+ 					}
+ 					ldap_value_free( vals );
+ 				}
++				ldap_memfree( attribute );
+ 			}
+-			ldap_memfree( attribute );
+ 			if( ber != NULL ) {
+ 				ber_free( ber, 0 );
+ 			}
+@@ -863,8 +862,8 @@
+ 						}
+ 						ldap_value_free( vals );
+ 					}
++					ldap_memfree( attribute );
+ 				}
+-				ldap_memfree( attribute );
+ 				if( ber != NULL ) {
+ 					ber_free( ber, 0 );
+ 				}
+@@ -950,8 +949,8 @@
+ 					}
+ 					ldap_value_free( vals );
+ 				}
++				ldap_memfree( attribute );
+ 			}
+-			ldap_memfree( attribute );
+ 			if( ber != NULL ) {
+ 				ber_free( ber, 0 );
+ 			}
+@@ -994,8 +993,8 @@
+ 						}
+ 						ldap_value_free( vals );
+ 					}
++					ldap_memfree( attribute );
+ 				}
+-				ldap_memfree( attribute );
+ 				if( ber != NULL ) {
+ 					ber_free( ber, 0 );
+ 				}


Index: sylpheed.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sylpheed/F-8/sylpheed.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- sylpheed.spec	2 Nov 2007 10:15:50 -0000	1.61
+++ sylpheed.spec	17 Dec 2007 15:01:53 -0000	1.62
@@ -5,7 +5,7 @@
 Summary: GTK+ based, lightweight, and fast email client
 Name: sylpheed
 Version: 2.4.7
-Release: 1.2
+Release: 1.3
 License: GPLv2+
 URL: http://sylpheed.sraoss.jp/
 Group: Applications/Internet
@@ -90,6 +90,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Dec 17 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.4.7-1.3
+- Upstreamed patch lead to discovery of similar memory leaks in syldap.c
+
 * Fri Nov 02 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.4.7-1.2
 - Patch a memory leak and glib critical warning in LDAP syldap.c.