model: fixed to check callback allocation and uuid

src/dbus-objects/misc.c

@@ -1647,7 +1647,7 @@ __ni_objectmodel_callback_info_to_dict(const ni_objectmodel_callback_info_t *cb,
 		ni_dbus_variant_init_dict(info_dict);
 
 		ni_dbus_dict_add_string(info_dict, "event", cb->event);
-		ni_dbus_variant_set_uuid(ni_dbus_dict_add(info_dict, "uuid"), &cb->uuid);
+		ni_dbus_dict_add_uuid(info_dict, "uuid", &cb->uuid);
 
 		cb = cb->next;
 	}
@@ -1659,20 +1659,20 @@ ni_objectmodel_callback_info_t *
 ni_objectmodel_callback_info_from_dict(const ni_dbus_variant_t *dict)
 {
 	ni_objectmodel_callback_info_t *result = NULL;
-	ni_dbus_variant_t *child = NULL, *var;
+	ni_dbus_variant_t *child = NULL;
 
 	while ((child = ni_dbus_dict_get_next(dict, "callback", child)) != NULL) {
 		ni_objectmodel_callback_info_t *cb;
 		const char *event;
 
-		cb = calloc(1, sizeof(*cb));
-		if (ni_dbus_dict_get_string(child, "event", &event))
-			ni_string_dup(&cb->event, event);
-		if ((var = ni_dbus_dict_get(child, "uuid")) != NULL)
-			ni_dbus_variant_get_uuid(var, &cb->uuid);
+		if ((cb = calloc(1, sizeof(*cb)))) {
+			if (ni_dbus_dict_get_string(child, "event", &event))
+				ni_string_dup(&cb->event, event);
+			ni_dbus_dict_get_uuid(child, "uuid", &cb->uuid);
 
-		cb->next = result;
-		result = cb;
+			cb->next = result;
+			result = cb;
+		}
 	}
 
 	return result;