From ae152621ade192de3ae6aec7c47dab4487b8244e Mon Sep 17 00:00:00 2001
From: Douglas Rumbaugh <dbr4@psu.edu>
Date: Mon, 29 May 2023 17:07:19 -0400
Subject: Framework query bugfixes

---
 include/framework/DynamicExtension.h | 2 +-
 include/shard/WIRS.h                 | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/framework/DynamicExtension.h b/include/framework/DynamicExtension.h
index 2dcbf18..4f3a3bc 100644
--- a/include/framework/DynamicExtension.h
+++ b/include/framework/DynamicExtension.h
@@ -157,7 +157,7 @@ public:
         // Merge the results together
         auto result = Q::merge(query_results);
 
-        for (size_t i=0; i<query_results.size(); i++) {
+        for (size_t i=0; i<states.size(); i++) {
             Q::delete_query_state(states[i]);
         }
 
diff --git a/include/shard/WIRS.h b/include/shard/WIRS.h
index 020df19..f3696a4 100644
--- a/include/shard/WIRS.h
+++ b/include/shard/WIRS.h
@@ -55,6 +55,11 @@ struct WIRSState {
     std::vector<wirs_node<R>*> nodes;
     Alias* top_level_alias;
 
+    WIRSState() {
+        tot_weight = 0;
+        top_level_alias = nullptr;
+    }
+
     ~WIRSState() {
         if (top_level_alias) delete top_level_alias;
     }
-- 
cgit v1.2.3