crossroads: Fixup introspection of children

Fixes: #412
diwic · Jan 4, 2023 · d913c60 · d913c60
1 parent bf1e745
commit d913c60
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/dbus-crossroads/src/crossroads.rs b/dbus-crossroads/src/crossroads.rs
@@ -235,7 +235,11 @@ impl Crossroads {
             let csub: &str = &c[substart..];
             if csub.len() == 0 || csub.as_bytes()[0] != b'/' { continue; }
             let csub1 = &csub[1..];
-            if direct_only && r.len() > 0 && csub1.as_bytes().starts_with(r[r.len()-1].as_bytes()) { continue; }
+            if direct_only && r.len() > 0 {
+                let prev = r[r.len()-1].as_bytes();
+                let b = csub1.as_bytes();
+                if b.len() > prev.len() && b.starts_with(prev) && b[prev.len()] == b'/' { continue; }
+            }
             r.push(csub1);
         };
         r

diff --git a/dbus-crossroads/src/test.rs b/dbus-crossroads/src/test.rs
@@ -143,6 +143,8 @@ const INTROSPECT: &str = r###"<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS O
   </interface>
   <node name="another_child_of_sample_object"/>
   <node name="child_of_sample_object"/>
+  <node name="child_of_sample_object2"/>
+  <node name="very/deep/child"/>
 </node>"###;
 
 #[test]
@@ -164,9 +166,11 @@ fn introspect() {
     });
     cr.insert("/com/example/sample_object0", &[token], ());
     cr.insert("/com/example/sample_object0/child_of_sample_object", &[], ());
+    cr.insert("/com/example/sample_object0/child_of_sample_object2", &[], ());
     cr.insert("/com/example/sample_object0/child_of_sample_object/subchild", &[], ());
     cr.insert("/com/example/sample_object0123", &[], ());
     cr.insert("/com/example/sample_object0/another_child_of_sample_object", &[], ());
+    cr.insert("/com/example/sample_object0/very/deep/child", &[], ());
 
     let msg = Message::new_method_call("com.example.dbusrs.crossroads.score", "/com/example/sample_object0",
         "org.freedesktop.DBus.Introspectable", "Introspect").unwrap();