rpms/bluez/devel bluez-sdp-xml-with-nulls-2.patch, NONE, 1.1 bluez.spec, 1.47, 1.48 bluez-sdp-xml-with-nulls.patch, 1.1, NONE

[Bastien Nocera]

Author: hadess

Update of /cvs/pkgs/rpms/bluez/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10564

Modified Files:
	bluez.spec 
Added Files:
	bluez-sdp-xml-with-nulls-2.patch 
Removed Files:
	bluez-sdp-xml-with-nulls.patch 
Log Message:
* Mon Mar 09 2009 - Bastien Nocera <bnocera at redhat.com> - 4.32-7
- A (slightly) different fix for parsing to XML when it contains a NULL


bluez-sdp-xml-with-nulls-2.patch:

--- NEW FILE bluez-sdp-xml-with-nulls-2.patch ---
diff --git a/common/sdp-xml.c b/common/sdp-xml.c
index 0403dcd..c3d3934 100644
--- a/common/sdp-xml.c
+++ b/common/sdp-xml.c
@@ -239,9 +239,7 @@ static void convert_raw_data_to_xml(sdp_data_t *value, int indent_level,
 		hex = 0;
 
 		for (i = 0; i < length; i++) {
-			if (value->val.str[i] == '\0')
-				break;
-			if (!isprint(value->val.str[i])) {
+			if (!isprint(value->val.str[i]) && value->val.str[i] != '\0') {
 				hex = 1;
 				break;
 			}
@@ -304,7 +302,9 @@ static void convert_raw_data_to_xml(sdp_data_t *value, int indent_level,
 					strBuf[j++] = 'o';
 					strBuf[j++] = 't';
 				}
-				else {
+				else if (value->val.str[i] == '\0') {
+					strBuf[j++] = ' ';
+				} else {
 					strBuf[j++] = value->val.str[i];
 				}
 			}


Index: bluez.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/bluez.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- bluez.spec	9 Mar 2009 15:28:31 -0000	1.47
+++ bluez.spec	9 Mar 2009 17:11:56 -0000	1.48
@@ -1,7 +1,7 @@
 Summary: Bluetooth utilities
 Name: bluez
 Version: 4.32
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz
@@ -13,7 +13,7 @@
 # http://thread.gmane.org/gmane.linux.bluez.kernel/1687
 Patch2: bluez-try-utf8-harder.patch
 # http://thread.gmane.org/gmane.linux.bluez.kernel/1688
-Patch3: bluez-sdp-xml-with-nulls.patch
+Patch3: bluez-sdp-xml-with-nulls-2.patch
 # http://thread.gmane.org/gmane.linux.bluez.kernel/1688/focus=1708
 Patch4: bluez-fix-sdp-copy-for-strings-with-nulls.patch
 
@@ -197,6 +197,9 @@
 %{_libdir}/alsa-lib/*.so
 
 %changelog
+* Mon Mar 09 2009 - Bastien Nocera <bnocera at redhat.com> - 4.32-7
+- A (slightly) different fix for parsing to XML when it contains a NULL
+
 * Mon Mar 09 2009 - Bastien Nocera <bnocera at redhat.com> - 4.32-6
 - Fix sdp_copy_record(), so records are properly exported through D-Bus
 


--- bluez-sdp-xml-with-nulls.patch DELETED ---