Fix POST processing of final keys without values

'MHD_destroy_post_processor' should be called before the request callback for ensuring the processing of final keys without terminated values.
etr · May 13, 2022 · a2dece8 · a2dece8
1 parent acc3e6a
commit a2dece8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/httpserver/details/modded_request.hpp b/src/httpserver/details/modded_request.hpp
@@ -61,9 +61,6 @@ struct modded_request {
     modded_request& operator=(modded_request&& b) = default;
 
     ~modded_request() {
-        if (nullptr != pp) {
-            MHD_destroy_post_processor(pp);
-        }
         if (second) {
             delete dhr;
         }

diff --git a/src/webserver.cpp b/src/webserver.cpp
@@ -662,6 +662,11 @@ MHD_Result webserver::finalize_answer(MHD_Connection* connection, struct details
     if (found) {
         try {
             if (hrm->is_allowed(method)) {
+                if (mr->pp != NULL) {
+                    MHD_destroy_post_processor(mr->pp);
+                    mr->pp = NULL;
+                }
+
                 mr->dhrs = ((hrm)->*(mr->callback))(*mr->dhr);  // copy in memory (move in case)
                 if (mr->dhrs.get() == nullptr || mr->dhrs->get_response_code() == -1) {
                     mr->dhrs = internal_error_page(mr);