Prevent nullptr dereference in {MultiPerform,Session}::intercept()

libcpr · Feb 12, 2025 · 55d6d9a · 55d6d9a
1 parent 2a147f2
commit 55d6d9a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/cpr/multiperform.cpp b/cpr/multiperform.cpp
@@ -353,6 +353,9 @@ const std::optional<std::vector<Response>> MultiPerform::intercept() {
     }
 
     if (current_interceptor_ != interceptors_.end()) {
+        if (*current_interceptor_ == nullptr) {
+            return std::nullopt;
+        }
         auto icpt = current_interceptor_;
         // Nested makeRequest() start at first_interceptor_, thus excluding previous interceptors.
         first_interceptor_ = current_interceptor_;

diff --git a/cpr/session.cpp b/cpr/session.cpp
@@ -912,6 +912,9 @@ const std::optional<Response> Session::intercept() {
     }
 
     if (current_interceptor_ != interceptors_.end()) {
+        if (*current_interceptor_ == nullptr) {
+            return std::nullopt;
+        }
         auto icpt = current_interceptor_;
         // Nested makeRequest() start at first_interceptor_, thus excluding previous interceptors.
         first_interceptor_ = current_interceptor_;