Re: [Bluez-devel] HCID D-Bus (Seg Fault)

[Claudio Takahasi <cktakahasi@gmail.com>]

[-- Attachment #1.1: Type: text/plain, Size: 932 bytes --]

Hi Marcel,

The patch for reply_handler_function is attached.

Regards,
Claudio.

On 9/12/05, Marcel Holtmann <marcel@holtmann.org> wrote:
> 
> Hi Claudio,
> 
> > Regarding the reply_handler_function, please check if it is relevant.
> > I you want I can send only the changes for handle the error messages.
> 
> please do so.
> 
> Regards
> 
> Marcel
> 
> 
> 
> 
> -------------------------------------------------------
> SF.Net email is Sponsored by the Better Software Conference & EXPO
> September 19-22, 2005 * San Francisco, CA * Development Lifecycle 
> Practices
> Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
> Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
> _______________________________________________
> Bluez-devel mailing list
> Bluez-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/bluez-devel
>

[-- Attachment #1.2: Type: text/html, Size: 1425 bytes --]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: hcid_dbus_0003.patch --]
[-- Type: text/x-patch; name="hcid_dbus_0003.patch", Size: 1998 bytes --]

--- bluez-utils-2.21.orig/hcid/dbus.c	2005-08-27 10:37:14.000000000 -0300
+++ bluez-hcid-2.21/hcid/dbus.c	2005-09-13 09:01:20.409052488 -0300
@@ -68,27 +68,43 @@
 	pin_code_reply_cp pr;
 	DBusMessage *message;
 	DBusMessageIter iter;
-	int type;
+	int arg_type;
+	int msg_type;
 	size_t len;
 	char *pin;
+	const char *error_msg;
 
 	message = dbus_pending_call_steal_reply(call);
 
-	if (dbus_message_is_error(message, WRONG_ARGS_ERROR))
-		goto error;
-
+	if (message) {
+		msg_type = dbus_message_get_type(message);
 	dbus_message_iter_init(message, &iter);
 
-	type = dbus_message_iter_get_arg_type(&iter);
-	if (type != DBUS_TYPE_STRING)
-		goto error;
+		if (msg_type == DBUS_MESSAGE_TYPE_ERROR) {
+#ifdef HAVE_DBUS_MESSAGE_ITER_GET_BASIC
+		        dbus_message_iter_get_basic(&iter, &error_msg);
+#else
+		        erro_msg = dbus_message_iter_get_string(&iter);
+#endif
+			/* handling WRONG_ARGS_ERROR, DBUS_ERROR_NO_REPLY, DBUS_ERROR_SERVICE_UNKNOWN */
+			syslog(LOG_ERR, "%s: %s", dbus_message_get_error_name(message), error_msg);
 
+			hci_send_cmd(req->dev, OGF_LINK_CTL,
+				OCF_PIN_CODE_NEG_REPLY, 6, &req->bda);
+		} else {
+			/* check signature */
+			arg_type = dbus_message_iter_get_arg_type(&iter);	
+			if (arg_type != DBUS_TYPE_STRING) {
+				syslog(LOG_ERR, "Wrong reply signature: expected PIN");
+			
+				hci_send_cmd(req->dev, OGF_LINK_CTL,
+				     OCF_PIN_CODE_NEG_REPLY, 6, &req->bda);
+			} else {
 #ifdef HAVE_DBUS_MESSAGE_ITER_GET_BASIC
 	dbus_message_iter_get_basic(&iter, &pin);
 #else
 	pin = dbus_message_iter_get_string(&iter);
 #endif
-
 	len = strlen(pin);
 
 	memset(&pr, 0, sizeof(pr));
@@ -97,15 +113,12 @@
 	pr.pin_len = len;
 	hci_send_cmd(req->dev, OGF_LINK_CTL, OCF_PIN_CODE_REPLY,
 						PIN_CODE_REPLY_CP_SIZE, &pr);
+			}
 
+		}
 	dbus_message_unref(message);
+	}
 	dbus_pending_call_unref(call);
-
-	return;
-
-error:
-	hci_send_cmd(req->dev, OGF_LINK_CTL,
-				OCF_PIN_CODE_NEG_REPLY, 6, &req->bda);
 }
 
 static void free_pin_req(void *req)