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

[Claudio Takahasi <cktakahasi@gmail.com>]

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

Hi Marcel,

It's done! The changes was based on the dbus.c revision 1.15.

Regards,
Claudio.

On 9/13/05, Marcel Holtmann <marcel@holtmann.org> wrote:
> 
> Hi Claudio,
> 
> > The patch for reply_handler_function is attached.
> 
> please redo it against the latest CVS, because I already dropped the
> D-Bus 0.23 support.
> 
> Regards
> 
> Marcel
> 
> 
> 
> 
> -------------------------------------------------------
> SF.Net email is sponsored by:
> Tame your development challenges with Apache's Geronimo App Server.
> Download it for free - -and be entered to win a 42" plasma tv or your very
> own Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
> _______________________________________________
> Bluez-devel mailing list
> Bluez-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/bluez-devel
>

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

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

--- bluez-utils-cvs.orig/hcid/dbus.c	2005-09-14 08:51:58.470937024 -0300
+++ bluez-utils-cvs/hcid/dbus.c	2005-09-14 08:46:09.853934864 -0300
@@ -64,43 +64,54 @@
 
 static void reply_handler_function(DBusPendingCall *call, void *user_data)
 {
-	struct pin_request *req = (struct pin_request *) user_data;
-	pin_code_reply_cp pr;
-	DBusMessage *message;
-	DBusMessageIter iter;
-	int type;
-	size_t len;
-	char *pin;
-
-	message = dbus_pending_call_steal_reply(call);
-
-	if (dbus_message_is_error(message, WRONG_ARGS_ERROR))
-		goto error;
-
-	dbus_message_iter_init(message, &iter);
-
-	type = dbus_message_iter_get_arg_type(&iter);
-	if (type != DBUS_TYPE_STRING)
-		goto error;
-
-	dbus_message_iter_get_basic(&iter, &pin);
-	len = strlen(pin);
-
-	memset(&pr, 0, sizeof(pr));
-	bacpy(&pr.bdaddr, &req->bda);
-	memcpy(pr.pin_code, pin, len);
-	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);
+        struct pin_request *req = (struct pin_request *) user_data;
+        pin_code_reply_cp pr;
+        DBusMessage *message;
+        DBusMessageIter iter;
+        int arg_type;
+        int msg_type;
+        size_t len;
+        char *pin;
+        const char *error_msg;
+
+        message = dbus_pending_call_steal_reply(call);
+
+        if (message) {
+                msg_type = dbus_message_get_type(message);
+                dbus_message_iter_init(message, &iter);
+
+                if (msg_type == DBUS_MESSAGE_TYPE_ERROR) {
+                        dbus_message_iter_get_basic(&iter, &error_msg);
+                        /* 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 {
+                                dbus_message_iter_get_basic(&iter, &pin);
+
+                                len = strlen(pin);
+
+                                memset(&pr, 0, sizeof(pr));
+                                bacpy(&pr.bdaddr, &req->bda);
+                                memcpy(pr.pin_code, pin, len);
+                                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);
 }
 
 static void free_pin_req(void *req)