fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-29 04:30:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

platform: avoid undefined behavior comparing unrelated pointers in nmp_object_id_cmp()

Browse source 
Pointers cannot in general be compared directly. Cast to an int first
to avoid the undefined behavior.

(cherry picked from commit b2a5b179fd)
This commit is contained in:
Thomas Haller 2020-04-22 09:32:06 +02:00
parent 198563ad93
commit aa759765c5
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/platform/nmp-object.c
View file

@ -1405,15 +1405,15 @@ nmp_object_id_cmp (const NMPObject *obj1, const NMPObject *obj2)
nm_assert (klass2);
NM_CMP_DIRECT (klass->obj_type, klass2->obj_type);
/* resort to pointer comparison */
if (klass < klass2)
return -1;
return 1;
NM_CMP_DIRECT_PTR (klass, klass2);
return 0;
}
if (!klass->cmd_plobj_id_cmp) {
/* the klass doesn't implement ID cmp(). That means, different objects
* never compare equal, but the cmp() according to their pointer value. */
return (obj1 < obj2) ? -1 : 1;
NM_CMP_DIRECT_PTR (obj1, obj2);
return 0;
}
return klass->cmd_plobj_id_cmp (&obj1->object, &obj2->object);