From a12a5a1a0132527afe87c079e4aae4aad372bd94 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Thu, 5 Nov 2015 23:35:31 -0700 Subject: qapi: Simplify error cleanup in test-qmp-* We have several tests that perform multiple sub-actions that are expected to fail. Asserting that an error occurred, then clearing it up to prepare for the next action, turned into enough boilerplate that it was sometimes forgotten (for example, a number of tests added to test-qmp-input-visitor.c in d88f5fd leaked err). Worse, if an error is not reset to NULL, we risk invalidating later use of that error (passing a non-NULL err into a function is generally a bad idea). Encapsulate the boilerplate into a single helper function error_free_or_abort(), and consistently use it. The new function is added into error.c for use everywhere, although it is anticipated that testsuites will be the main client. Signed-off-by: Eric Blake Signed-off-by: Markus Armbruster --- util/error.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'util/error.c') diff --git a/util/error.c b/util/error.c index 8b86490ba1..80c89a2079 100644 --- a/util/error.c +++ b/util/error.c @@ -220,6 +220,13 @@ void error_free(Error *err) } } +void error_free_or_abort(Error **errp) +{ + assert(errp && *errp); + error_free(*errp); + *errp = NULL; +} + void error_propagate(Error **dst_errp, Error *local_err) { if (!local_err) { -- cgit v1.2.3