xemu-project/xemu
1
0
Fork 0
mirror of https://github.com/xemu-project/xemu.git synced 2024-11-23 11:39:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

qom: Fix ambiguous path detection when ambiguous=NULL

Browse Source 
object_resolve_path*() ambiguous path detection breaks when
ambiguous==NULL and the object tree have 3 objects of the same type and
only 2 of them are under the same parent.  e.g.:

 /container/obj1 (TYPE_FOO)
 /container/obj2 (TYPE_FOO)
 /obj2 (TYPE_FOO)

With the above tree, object_resolve_path_type("", TYPE_FOO, NULL) will
incorrectly return /obj2, because the search inside "/container" will
return NULL, and the match at "/obj2" won't be detected as ambiguous.

Fix that by always calling object_resolve_partial_path() with a non-NULL
ambiguous parameter.

Test case included.

Reported-by: Igor Mammedov <imammedo@redhat.com>
Cc: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <20170707213052.13087-3-ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
Eduardo Habkost 2017-07-07 18:30:52 -03:00
parent 6d1e30c4ac
commit ebcc479eee
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
qom/object.c
View File

@ -1712,15 +1712,13 @@ static Object *object_resolve_partial_path(Object *parent,
typename, ambiguous); typename, ambiguous);
if (found) { if (found) {
if (obj) { if (obj) {
if (ambiguous) { *ambiguous = true;
*ambiguous = true;
}
return NULL; return NULL;
} }
obj = found; obj = found;
} }
if (ambiguous && *ambiguous) { if (*ambiguous) {
return NULL; return NULL;
} }
} }
@ -1729,7 +1727,7 @@ static Object *object_resolve_partial_path(Object *parent,
} }
Object *object_resolve_path_type(const char *path, const char *typename, Object *object_resolve_path_type(const char *path, const char *typename,
bool *ambiguous) bool *ambiguousp)
{ {
Object *obj; Object *obj;
gchar **parts; gchar **parts;
@ -1738,11 +1736,12 @@ Object *object_resolve_path_type(const char *path, const char *typename,
assert(parts); assert(parts);
if (parts[0] == NULL || strcmp(parts[0], "") != 0) { if (parts[0] == NULL || strcmp(parts[0], "") != 0) {
if (ambiguous) { bool ambiguous = false;
*ambiguous = false;
}
obj = object_resolve_partial_path(object_get_root(), parts, obj = object_resolve_partial_path(object_get_root(), parts,
typename, ambiguous); typename, &ambiguous);
if (ambiguousp) {
*ambiguousp = ambiguous;
}
} else { } else {
obj = object_resolve_abs_path(object_get_root(), parts, typename, 1); obj = object_resolve_abs_path(object_get_root(), parts, typename, 1);
} }

3
tests/check-qom-proplist.c
View File

@ -593,14 +593,17 @@ static void test_qom_partial_path(void)
ambiguous = false; ambiguous = false;
g_assert(!object_resolve_path_type("", TYPE_DUMMY, &ambiguous)); g_assert(!object_resolve_path_type("", TYPE_DUMMY, &ambiguous));
g_assert(ambiguous); g_assert(ambiguous);
g_assert(!object_resolve_path_type("", TYPE_DUMMY, NULL));
ambiguous = false; ambiguous = false;
g_assert(!object_resolve_path("obj2", &ambiguous)); g_assert(!object_resolve_path("obj2", &ambiguous));
g_assert(ambiguous); g_assert(ambiguous);
g_assert(!object_resolve_path("obj2", NULL));
ambiguous = false; ambiguous = false;
g_assert(object_resolve_path("obj1", &ambiguous) == obj1); g_assert(object_resolve_path("obj1", &ambiguous) == obj1);
g_assert(!ambiguous); g_assert(!ambiguous);
g_assert(object_resolve_path("obj1", NULL) == obj1);
object_unparent(obj2b); object_unparent(obj2b);
object_unparent(cont1); object_unparent(cont1);