X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd-link-bus.c;h=1a1524dfb4e317013077e086a7520d27fc3da94e;hp=f7eae87edd13bd72193b8198785e2c291072cec4;hb=1c11181458990715e0ffd49e848baac5959e3c89;hpb=4852e15970ec652b823bf568b398f730be1fe1a5

diff --git a/src/network/networkd-link-bus.c b/src/network/networkd-link-bus.c
index f7eae87ed..1a1524dfb 100644
--- a/src/network/networkd-link-bus.c
+++ b/src/network/networkd-link-bus.c
@@ -38,12 +38,19 @@ const sd_bus_vtable link_vtable[] = {
 };
 
 static char *link_bus_path(Link *link) {
+        _cleanup_free_ char *ifindex = NULL;
         char *p;
+        int r;
 
         assert(link);
         assert(link->ifindex > 0);
 
-        asprintf(&p, "/org/freedesktop/network1/link/%d", link->ifindex);
+        if (asprintf(&ifindex, "%d", link->ifindex) < 0)
+                return NULL;
+
+        r = sd_bus_path_encode("/org/freedesktop/network1/link", ifindex, &p);
+        if (r < 0)
+                return NULL;
 
         return p;
 }
@@ -79,6 +86,7 @@ int link_node_enumerator(sd_bus *bus, const char *path, void *userdata, char ***
 }
 
 int link_object_find(sd_bus *bus, const char *path, const char *interface, void *userdata, void **found, sd_bus_error *error) {
+        _cleanup_free_ char *identifier = NULL;
         Manager *m = userdata;
         Link *link;
         int ifindex, r;
@@ -89,7 +97,12 @@ int link_object_find(sd_bus *bus, const char *path, const char *interface, void
         assert(m);
         assert(found);
 
-        if (sscanf(path, "/org/freedesktop/network1/link/%d", &ifindex) != 1)
+        r = sd_bus_path_decode(path, "/org/freedesktop/network1/link", &identifier);
+        if (r < 0)
+                return 0;
+
+        r = safe_atoi(identifier, &ifindex);
+        if (r < 0)
                 return 0;
 
         r = link_get(m, ifindex, &link);