rpms/NetworkManager-vpnc/EL-5 NetworkManager-vpnc-0.7.0.99-null.patch, NONE, 1.1 NetworkManager-vpnc.spec, 1.25, 1.26

[Lubomir Rintel]

Author: lkundrak

Update of /cvs/pkgs/rpms/NetworkManager-vpnc/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17677

Modified Files:
	NetworkManager-vpnc.spec 
Added Files:
	NetworkManager-vpnc-0.7.0.99-null.patch 
Log Message:
* Fri Apr 10 2009 Lubomir Rintel <lkundrak at v3.sk> 1:0.7.0.99-1.3
- Fix keyring NULL dereference


NetworkManager-vpnc-0.7.0.99-null.patch:

--- NEW FILE NetworkManager-vpnc-0.7.0.99-null.patch ---
Fix a possible NULL pointer dereference.

Lubomir Rintel <lkundrak at v3.sk>

diff -up NetworkManager-vpnc-0.7.0.99/properties/nm-vpnc.c.null NetworkManager-vpnc-0.7.0.99/properties/nm-vpnc.c
--- NetworkManager-vpnc-0.7.0.99/properties/nm-vpnc.c.null	2009-04-10 12:59:45.000000000 +0200
+++ NetworkManager-vpnc-0.7.0.99/properties/nm-vpnc.c	2009-04-10 14:20:38.000000000 +0200
@@ -200,15 +200,21 @@ fill_vpn_passwords (VpncPluginUiWidget *
 			                                VPNC_USER_PASSWORD,
 			                                &password,
 			                                NULL);
-			if (!password)
-				password = strdup (nm_setting_vpn_get_secret (s_vpn, NM_VPNC_KEY_XAUTH_PASSWORD));
+			if (!password) {
+				tmp = nm_setting_vpn_get_secret (s_vpn, NM_VPNC_KEY_XAUTH_PASSWORD);
+				if (tmp)
+					password = strdup (tmp);
+			}
 
 			keyring_helpers_get_one_secret (nm_setting_connection_get_uuid (s_con),
 			                                VPNC_GROUP_PASSWORD,
 			                                &group_password,
 			                                NULL);
-			if (!group_password)
-				group_password = strdup (nm_setting_vpn_get_secret (s_vpn, NM_VPNC_KEY_SECRET));
+			if (!group_password) {
+				tmp = nm_setting_vpn_get_secret (s_vpn, NM_VPNC_KEY_SECRET);
+				if (tmp)
+					group_password = strdup (tmp);
+			}
 		}
 	}
 


Index: NetworkManager-vpnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-vpnc/EL-5/NetworkManager-vpnc.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- NetworkManager-vpnc.spec	2 Apr 2009 14:23:22 -0000	1.25
+++ NetworkManager-vpnc.spec	10 Apr 2009 12:28:36 -0000	1.26
@@ -10,12 +10,13 @@
 Name:      NetworkManager-vpnc
 Epoch:     1
 Version:   0.7.0.99
-Release:   1%{svn_snapshot}%{?dist}.2
+Release:   1%{svn_snapshot}%{?dist}.3
 License:   GPLv2+
 Group:     System Environment/Base
 URL:       http://www.gnome.org/projects/NetworkManager/
 Source:    %{name}-%{version}%{svn_snapshot}.tar.gz
 Patch0:    NetworkManager-vpnc-0.7.0.99-keyring.patch
+Patch1:    NetworkManager-vpnc-0.7.0.99-null.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 BuildRequires: gtk2-devel             >= %{gtk2_version}
@@ -47,6 +48,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .keyring
+%patch1 -p1 -b .null
 
 
 %build
@@ -101,6 +103,9 @@
 %dir %{_datadir}/gnome-vpn-properties/vpnc
 
 %changelog
+* Fri Apr 10 2009 Lubomir Rintel <lkundrak at v3.sk> 1:0.7.0.99-1.3
+- Fix keyring NULL dereference
+
 * Thu Apr  2 2009 Lubomir Rintel <lkundrak at v3.sk> 1:0.7.0.99-1.2
 - Work around EPEL buildsys bug by removing versioned BRs