jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-12 22:09:25 +08:00
Code Issues Projects Releases Wiki Activity

sipaccountbase: avoid use after free for publishedIpAddress_

Browse Source 
Change-Id: I2b6b5c81798b6fb9fbd977e64705bbd2d3364d27
This commit is contained in:
Sébastien Blin
2020-01-15 14:47:53 -05:00
committed by Adrien Béraud
parent 1b6ab3dff0
commit 11c1afb659
4 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/sip/sipaccount.cpp
View File

@ -446,8 +446,9 @@ void SIPAccount::serialize(YAML::Emitter &out) const
void SIPAccount::usePublishedAddressPortInVIA()
{
via_addr_.host.ptr = (char *) publishedIpAddress_.c_str();
via_addr_.host.slen = publishedIpAddress_.size();
publishedIpStr_ = publishedIp_.toString();
via_addr_.host.ptr = (char *) publishedIpStr_.c_str();
via_addr_.host.slen = publishedIpStr_.size();
via_addr_.port = publishedPort_;
}
@ -1413,7 +1414,7 @@ SIPAccount::getContactHeader(pjsip_transport* t)
useUPnPAddressPortInVIA();
JAMI_DBG("Using UPnP address %s and port %d", address.c_str(), port);
} else if (not publishedSameasLocal_) {
address = publishedIpAddress_;
address = publishedIp_.toString();
port = publishedPort_;
JAMI_DBG("Using published address %s and port %d", address.c_str(), port);
} else if (stunEnabled_) {

3
src/sip/sipaccount.h
View File

@ -782,6 +782,9 @@ class SIPAccount : public SIPAccountBase {
*/
pjsip_host_port via_addr_;
// This is used at runtime . Mainly by SIPAccount::usePublishedAddressPortInVIA()
std::string publishedIpStr_ {};
/**
* Temporary storage for getUPnPIpAddress().toString()
* Used only by useUPnPAddressPortInVIA().

4
src/sip/sipaccountbase.cpp
View File

@ -268,7 +268,6 @@ SIPAccountBase::getAccountDetails() const
a.emplace(Conf::CONFIG_PUBLISHED_PORT, std::to_string(publishedPort_));
a.emplace(Conf::CONFIG_PUBLISHED_SAMEAS_LOCAL, publishedSameasLocal_ ? TRUE_STR : FALSE_STR);
a.emplace(Conf::CONFIG_PUBLISHED_ADDRESS, publishedIpAddress_);
a.emplace(Conf::CONFIG_STUN_ENABLE, stunEnabled_ ? TRUE_STR : FALSE_STR);
a.emplace(Conf::CONFIG_STUN_SERVER, stunServer_);
a.emplace(Conf::CONFIG_TURN_ENABLE, turnEnabled_ ? TRUE_STR : FALSE_STR);
@ -431,9 +430,8 @@ void
SIPAccountBase::setPublishedAddress(const IpAddr& ip_addr)
{
publishedIp_ = ip_addr;
publishedIpAddress_ = ip_addr.toString();
JAMI_DBG("[Account %s] Using public address %s", getAccountID().c_str(),
publishedIpAddress_.c_str());
publishedIp_.toString().c_str());
}
} // namespace jami

1
src/sip/sipaccountbase.h
View File

@ -353,6 +353,7 @@ protected:
*/
IpAddr publishedIp_ {};
// This will be stored in the configuration
std::string publishedIpAddress_ {};
/**