From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Mon, 2 Mar 2020 20:05:38 +0000 (+0100)
Subject: codegen: g_clear_error() sets pointer target to NULL already
X-Git-Tag: 0.48.0~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3444876adc131b5bb28a40fb4f30cb3023d3de7b;p=thirdparty%2Fvala.git

codegen: g_clear_error() sets pointer target to NULL already
---

diff --git a/codegen/valagerrormodule.vala b/codegen/valagerrormodule.vala
index 057e982ba..b618f7b15 100644
--- a/codegen/valagerrormodule.vala
+++ b/codegen/valagerrormodule.vala
@@ -363,6 +363,7 @@ public class Vala.GErrorModule : CCodeDelegateModule {
 		if (clause.error_variable != null) {
 			visit_local_variable (clause.error_variable);
 			ccode.add_assignment (get_variable_cexpression (get_local_cname (clause.error_variable)), get_inner_error_cexpression ());
+			ccode.add_assignment (get_inner_error_cexpression (), new CCodeConstant ("NULL"));
 		} else {
 			// error object is not used within catch statement, clear it
 			cfile.add_include ("glib.h");
@@ -370,7 +371,6 @@ public class Vala.GErrorModule : CCodeDelegateModule {
 			cclear.add_argument (new CCodeUnaryExpression (CCodeUnaryOperator.ADDRESS_OF, get_inner_error_cexpression ()));
 			ccode.add_expression (cclear);
 		}
-		ccode.add_assignment (get_inner_error_cexpression (), new CCodeConstant ("NULL"));
 
 		clause.body.emit (this);