From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42476) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VlqLF-0006My-Lo for qemu-devel@nongnu.org; Wed, 27 Nov 2013 20:24:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VlqL9-0007xU-M9 for qemu-devel@nongnu.org; Wed, 27 Nov 2013 20:24:29 -0500 Received: from mx1.redhat.com ([209.132.183.28]:8653) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VlqL9-0007wz-D3 for qemu-devel@nongnu.org; Wed, 27 Nov 2013 20:24:23 -0500 From: Igor Mammedov Date: Thu, 28 Nov 2013 02:24:18 +0100 Message-Id: <1385601858-8065-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH] qom: abort on error in property setter if caller passed errp == NULL List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, peter.crosthwaite@xilinx.com, afaerber@suse.de, anthony@codemonkey.ws, mst@redhat.com in case if caller setting property doesn't care about error and passes in NULL as errp argument but error occurs in property setter, it is silently discarded leaving object in undefined state. As result it leads to hard to find bugs, so if caller doesn't care about error it must be sure that property exists and accepts provided value, otherwise it's better to abort early since error case couldn't be handled gracefully and find invalid usecase early. In addition multitude of property setters will be always guarantied to have error object present and won't be required to handle this condition individually. Signed-off-by: Igor Mammedov --- qom/object.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/qom/object.c b/qom/object.c index fc19cf6..2c0bb64 100644 --- a/qom/object.c +++ b/qom/object.c @@ -792,16 +792,25 @@ void object_property_get(Object *obj, Visitor *v, const char *name, void object_property_set(Object *obj, Visitor *v, const char *name, Error **errp) { - ObjectProperty *prop = object_property_find(obj, name, errp); - if (prop == NULL) { - return; + Error *local_error = NULL; + ObjectProperty *prop = object_property_find(obj, name, &local_error); + if (local_error) { + goto out; } if (!prop->set) { - error_set(errp, QERR_PERMISSION_DENIED); + error_set(&local_error, QERR_PERMISSION_DENIED); } else { - prop->set(obj, v, prop->opaque, name, errp); + prop->set(obj, v, prop->opaque, name, &local_error); } +out: + if (local_error) { + if (!errp) { + assert_no_error(local_error); + } + error_propagate(errp, local_error); + } + } void object_property_set_str(Object *obj, const char *value, -- 1.8.3.1