From 4049cc893f28106bf7d4e895a3476d7311df2fe3 Mon Sep 17 00:00:00 2001
From: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
Date: Wed, 18 Mar 2015 17:52:39 -0400
Subject: [PATCH] upnp: fix null deferencing during mapping
Refs #68811
Change-Id: I65e63c4b2998ea1c76041e6ee24bb698715d5fca
---
daemon/src/upnp/upnp_control.cpp | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/daemon/src/upnp/upnp_control.cpp b/daemon/src/upnp/upnp_control.cpp
index c30dbaefab..ffcf933fa5 100644
--- a/daemon/src/upnp/upnp_control.cpp
+++ b/daemon/src/upnp/upnp_control.cpp
@@ -82,12 +82,13 @@ Controller::addAnyMapping(uint16_t port_desired,
Mapping mapping = upnpContext_->addAnyMapping(port_desired, port_local, type,
use_same_port, unique);
if (mapping) {
+ auto usedPort = mapping.getPortExternal();
if (port_used)
- *port_used = mapping.getPortExternal();
+ *port_used = usedPort;
/* add to map */
auto& instanceMappings = type == PortType::UDP ? udpMappings_ : tcpMappings_;
- instanceMappings.emplace(*port_used, std::move(mapping));
+ instanceMappings.emplace(usedPort, std::move(mapping));
return true;
}
#endif
--
GitLab