Re: [Bluez-users] pairing on x86_64

[Marcel Holtmann <marcel@holtmann.org>]

[-- Attachment #1: Type: text/plain, Size: 689 bytes --]

Hi Volker,

> I couldn't understand too, but with your sizeof(char) question you made me 
> curious.
> 
> On x86_64, int has a size of 4 and size_t takes 8 (while on x86 both have a 
> size of 4).
> By passing &len to g_io_channel_read (which takes a size_t *buffer_read as 
> argument), we blank out the first four bytes of buf - which sits directly 
> after len in memory ('oh wonderful world...').
> 
> > This can be a problem that the call of the PIN helper program fails.
> This problem is also solved with the change from int len to size_t len.
> 
> So, please trash my first patch and take this instead.

and here is the patch I am going to apply. Please test it.

Regards

Marcel


[-- Attachment #2: patch --]
[-- Type: text/x-patch, Size: 1206 bytes --]

Index: hcid/main.c
===================================================================
RCS file: /cvsroot/bluez/utils/hcid/main.c,v
retrieving revision 1.11
diff -u -r1.11 main.c
--- hcid/main.c	17 Feb 2004 18:04:03 -0000	1.11
+++ hcid/main.c	22 Feb 2004 02:09:29 -0000
@@ -397,10 +397,11 @@
 
 gboolean io_stack_event(GIOChannel *chan, GIOCondition cond, gpointer data)
 {
-	char buf[HCI_MAX_FRAME_SIZE], *ptr;
+	unsigned char buf[HCI_MAX_FRAME_SIZE], *ptr;
 	evt_stack_internal *si;
 	hci_event_hdr *eh;
-	int  len, type;
+	int type;
+	size_t len;
 	GIOError err;
 
 	ptr = buf;
Index: hcid/security.c
===================================================================
RCS file: /cvsroot/bluez/utils/hcid/security.c,v
retrieving revision 1.9
diff -u -r1.9 security.c
--- hcid/security.c	17 Feb 2004 18:04:03 -0000	1.9
+++ hcid/security.c	22 Feb 2004 02:09:29 -0000
@@ -365,9 +365,10 @@
 
 gboolean io_security_event(GIOChannel *chan, GIOCondition cond, gpointer data)
 {
-	char buf[HCI_MAX_EVENT_SIZE], *ptr = buf;
+	unsigned char buf[HCI_MAX_EVENT_SIZE], *ptr = buf;
 	struct hci_dev_info *di = (void *) data;
-	int len, type, dev;
+	int type, dev;
+	size_t len;
 	hci_event_hdr *eh;
 	GIOError err;