rpms/wpa_supplicant/F-8 wpa_supplicant-0.5.7-dbus-blobs.patch, 1.1, 1.2 wpa_supplicant.spec, 1.32, 1.33

[Daniel Williams (dcbw)]

Author: dcbw

Update of /cvs/extras/rpms/wpa_supplicant/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9627

Modified Files:
	wpa_supplicant-0.5.7-dbus-blobs.patch wpa_supplicant.spec 
Log Message:
* Wed Oct 24 2007 Dan Williams <dcbw at redhat.com> - 0.5.7-12
- Fix conversion of byte arrays to strings by ensuring the buffer is NULL
    terminated after conversion



wpa_supplicant-0.5.7-dbus-blobs.patch:

Index: wpa_supplicant-0.5.7-dbus-blobs.patch
===================================================================
RCS file: /cvs/extras/rpms/wpa_supplicant/F-8/wpa_supplicant-0.5.7-dbus-blobs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wpa_supplicant-0.5.7-dbus-blobs.patch	21 Oct 2007 15:21:09 -0000	1.1
+++ wpa_supplicant-0.5.7-dbus-blobs.patch	24 Oct 2007 20:46:12 -0000	1.2
@@ -163,3 +163,23 @@
  #endif /* CONFIG_CTRL_IFACE_DBUS */
  
  #endif /* CTRL_IFACE_DBUS_HANDLERS_H */
+diff -up wpa_supplicant-0.5.7/config.c.dbus-blobs wpa_supplicant-0.5.7/config.c
+--- wpa_supplicant-0.5.7/config.c.dbus-blobs	2007-10-24 16:41:37.000000000 -0400
++++ wpa_supplicant-0.5.7/config.c	2007-10-24 16:41:49.000000000 -0400
+@@ -70,13 +70,14 @@ static char * wpa_config_parse_string(co
+ 		if (hlen & 1)
+ 			return NULL;
+ 		*len = hlen / 2;
+-		str = os_malloc(*len);
++		str = os_malloc(*len + 1);
+ 		if (str == NULL)
+ 			return NULL;
+ 		if (hexstr2bin(value, str, *len)) {
+ 			os_free(str);
+ 			return NULL;
+ 		}
++		str[*len] = '\0';
+ 		return (char *) str;
+ 	}
+ }
+


Index: wpa_supplicant.spec
===================================================================
RCS file: /cvs/extras/rpms/wpa_supplicant/F-8/wpa_supplicant.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- wpa_supplicant.spec	21 Oct 2007 15:21:09 -0000	1.32
+++ wpa_supplicant.spec	24 Oct 2007 20:46:12 -0000	1.33
@@ -2,7 +2,7 @@
 Name: wpa_supplicant
 Epoch: 1
 Version: 0.5.7
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Source0: http://hostap.epitest.fi/releases/%{name}-%{version}.tar.gz
@@ -148,6 +148,10 @@
 %{_bindir}/wpa_gui
 
 %changelog
+* Wed Oct 24 2007 Dan Williams <dcbw at redhat.com> - 0.5.7-12
+- Fix conversion of byte arrays to strings by ensuring the buffer is NULL
+    terminated after conversion
+
 * Sat Oct 20 2007 Dan Williams <dcbw at redhat.com> - 0.5.7-11
 - Add BLOB support to the D-Bus interface
 - Fix D-Bus interface permissions so that only root can use the wpa_supplicant