Merge branch 'topic/bbannier/coverity'

zeek · Jan 13, 2025 · 651c6b1 · 651c6b1
2 parents cf21f50 + d4bd71a
commit 651c6b1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,9 @@
+1.13.0-dev.68 | 2025-01-13 22:54:50 +0100
+
+  * GH-1958: Prevent copies in various places. (Benjamin Bannier, Corelight)
+
+    This adds a change incorrectly dropped from #1958.
+
 1.13.0-dev.66 | 2025-01-13 22:09:19 +0100
 
   * Prevent copies in various places. (Benjamin Bannier, Corelight)

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.13.0-dev.66
+1.13.0-dev.68
diff --git a/hilti/toolchain/src/compiler/codegen/statements.cc b/hilti/toolchain/src/compiler/codegen/statements.cc
@@ -348,8 +348,10 @@ struct Visitor : hilti::visitor::PreOrder {
 
             if ( init ) {
                 if ( n->condition() )
-                    outer_wrapper.addLocal(
-                        {cxx::ID(init->id()), cg->compile(init->type(), codegen::TypeUsage::Storage), {}, cxx_init});
+                    outer_wrapper.addLocal({cxx::ID(init->id()),
+                                            cg->compile(init->type(), codegen::TypeUsage::Storage),
+                                            {},
+                                            std::move(cxx_init)});
                 else
                     outer_wrapper.addLocal(
                         {cxx::ID(init->id()), cg->compile(init->type(), codegen::TypeUsage::Storage)});