[vala/staging] codegen: g_clear_error() sets pointer target to NULL already



commit 3444876adc131b5bb28a40fb4f30cb3023d3de7b
Author: Rico Tzschichholz <ricotz ubuntu com>
Date:   Mon Mar 2 21:05:38 2020 +0100

    codegen: g_clear_error() sets pointer target to NULL already

 codegen/valagerrormodule.vala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---
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);
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]