Clear stop_iteration_ flag non-status-returning callbacks.

Signed-off-by: mathetake <takeshi@tetrate.io>
proxy-wasm · Nov 10, 2020 · b416250 · b416250
1 parent 376ffaf
commit b416250
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/include/proxy-wasm/context.h b/include/proxy-wasm/context.h
@@ -377,6 +377,7 @@ class ContextBase : public RootInterface,
 
 protected:
   friend class WasmBase;
+  friend class DeferAfterCallActions;
 
   void initializeRootBase(WasmBase *wasm, std::shared_ptr<PluginBase> plugin);
   std::string makeRootLogPrefix(std::string_view vm_id) const;
@@ -402,11 +403,12 @@ class ContextBase : public RootInterface,
 
 class DeferAfterCallActions {
 public:
-  DeferAfterCallActions(ContextBase *context) : wasm_(context->wasm()) {}
+  DeferAfterCallActions(ContextBase *context) : context_(context) {}
   ~DeferAfterCallActions();
 
+protected:
 private:
-  WasmBase *const wasm_;
+  ContextBase *const context_;
 };
 
 uint32_t resolveQueueForTest(std::string_view vm_id, std::string_view queue_name);

diff --git a/src/context.cc b/src/context.cc
@@ -225,7 +225,10 @@ SharedData global_shared_data;
 
 } // namespace
 
-DeferAfterCallActions::~DeferAfterCallActions() { wasm_->doAfterVmCallActions(); }
+DeferAfterCallActions::~DeferAfterCallActions() {
+  context_->stop_iteration_ = false;
+  context_->wasm()->doAfterVmCallActions();
+}
 
 WasmResult BufferBase::copyTo(WasmBase *wasm, size_t start, size_t length, uint64_t ptr_ptr,
                               uint64_t size_ptr) const {