From bcf8ab5404c533dfa9e6604a50c2897cbfc10a2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Thu, 5 Sep 2019 11:23:23 -0400
Subject: [PATCH] http: check for null callbacks
---
src/http.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/http.cpp b/src/http.cpp
index cff3662d..a27ae183 100644
--- a/src/http.cpp
+++ b/src/http.cpp
@@ -352,7 +352,7 @@ Resolver::add_callback(ResolverCb cb)
{
std::lock_guard<std::mutex> lock(mutex_);
if (!completed_)
- cbs_.push(std::move(cb));
+ cbs_.emplace(std::move(cb));
else
cb(ec_, endpoints_);
}
@@ -587,7 +587,7 @@ void
Request::notify_state_change(const State state)
{
state_ = state;
- if (cbs_->on_state_change)
+ if (cbs_ and cbs_->on_state_change)
cbs_->on_state_change(state, response_);
}
--
GitLab