Index: source/ariba/utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.cpp
===================================================================
--- source/ariba/utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.cpp	(revision 4879)
+++ source/ariba/utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.cpp	(revision 4894)
@@ -149,4 +149,7 @@
 
 	// prepare the info attribute buffers
+	string namebuf, info1buf, info2buf, info3buf;
+	uint8_t namelen, info1len, info2len, info3len;
+
 	namelen = (uint8_t)name.length();
 	info1len = (uint8_t)info1.length();
@@ -207,10 +210,4 @@
 	sdp_set_info_attr(&record, service_name, service_prov, svc_dsc);
 
-
-	// add the info attributes
-	uint8_t namelen, info1len, info2len, info3len;
-	string namebuf, info1buf, info2buf, info3buf;
-
-
 	sdp_attr_add_new(&record, SDP_ATTR_SPOVNET_NAME, SDP_TEXT_STR32,
 			namebuf.data());
@@ -346,5 +343,5 @@
 	// prepare the buffers for the attributes
 	string name, info1, info2, info3;
-	name.reserve(2**32);
+	name.reserve(256);
 
 	// connect to the SDP server running on the remote machine