RE: [Bluez-devel] textfile.c find_key

[Marcel Holtmann <marcel@holtmann.org>]

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

Hi Robert,

> It might possibly be.  I'm using an Arm processor with the kernel
> version 2.6.10 for use with Busybox.  It's probably a safe bet that
> not many people are using an Arm  processor so it could be something
> about that.  I'll look around.

okay lets check for (map == NULL). The attached patch would do it the
right way.

Regards

Marcel


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

Index: textfile.c
===================================================================
RCS file: /cvsroot/bluez/utils/common/textfile.c,v
retrieving revision 1.9
diff -u -r1.9 textfile.c
--- textfile.c	29 Oct 2005 22:36:31 -0000	1.9
+++ textfile.c	9 Nov 2005 00:01:34 -0000
@@ -149,7 +149,7 @@
 	}
 
 	map = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_LOCKED, fd, 0);
-	if (map == MAP_FAILED) {
+	if (!map || map == MAP_FAILED) {
 		err = errno;
 		goto unlock;
 	}
@@ -243,7 +243,7 @@
 	size = st.st_size;
 
 	map = mmap(NULL, size, PROT_READ, MAP_SHARED, fd, 0);
-	if (map == MAP_FAILED) {
+	if (!map || map == MAP_FAILED) {
 		err = errno;
 		goto unlock;
 	}