bus: detect blocking message calls to our own connection and return ELOOP early

2013-11-12 00:12:44 +01:00
parent 1fee9de509
commit a8a07f892c
1 changed files with 13 additions and 0 deletions
@@ -1637,6 +1637,19 @@ _public_ int sd_bus_call(

                                sd_bus_message_unref(incoming);
                                return -EIO;
+
+                        } else if (incoming->header->serial == serial &&
+                                   bus->unique_name &&
+                                   incoming->sender &&
+                                   streq(bus->unique_name, incoming->sender)) {
+
+                                /* Our own message? Somebody is trying
+                                 * to send its own client a message,
+                                 * let's not dead-lock, let's fail
+                                 * immediately. */
+
+                                sd_bus_message_unref(incoming);
+                                return -ELOOP;
                        }

                        /* There's already guaranteed to be room for