зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1333185: memset PRNetAddr for UDPSocket::connect(). r=schien
MozReview-Commit-ID: JJb18xXNy1c --HG-- extra : rebase_source : a13f661eeb9ba4bc0b6c38f522b3c89c62ef9cc4
This commit is contained in:
Родитель
88fa83b99b
Коммит
ede12d1bfb
|
@ -310,6 +310,7 @@ UDPSocketParent::ConnectInternal(const nsCString& aHost, const uint16_t& aPort)
|
||||||
|
|
||||||
UDPSOCKET_LOG(("%s: %s:%u", __FUNCTION__, nsCString(aHost).get(), aPort));
|
UDPSOCKET_LOG(("%s: %s:%u", __FUNCTION__, nsCString(aHost).get(), aPort));
|
||||||
PRNetAddr prAddr;
|
PRNetAddr prAddr;
|
||||||
|
memset(&prAddr, 0, sizeof(prAddr));
|
||||||
PR_InitializeNetAddr(PR_IpAddrAny, aPort, &prAddr);
|
PR_InitializeNetAddr(PR_IpAddrAny, aPort, &prAddr);
|
||||||
PRStatus status = PR_StringToNetAddr(aHost.BeginReading(), &prAddr);
|
PRStatus status = PR_StringToNetAddr(aHost.BeginReading(), &prAddr);
|
||||||
if (status != PR_SUCCESS) {
|
if (status != PR_SUCCESS) {
|
||||||
|
|
|
@ -663,7 +663,8 @@ nsUDPSocket::InitWithAddress(const NetAddr *aAddr, nsIPrincipal *aPrincipal,
|
||||||
PR_SetSocketOption(mFD, &opt);
|
PR_SetSocketOption(mFD, &opt);
|
||||||
|
|
||||||
PRNetAddr addr;
|
PRNetAddr addr;
|
||||||
PR_InitializeNetAddr(PR_IpAddrAny, 0, &addr);
|
// Temporary work around for IPv6 until bug 1330490 is fixed
|
||||||
|
memset(&addr, 0, sizeof(addr));
|
||||||
NetAddrToPRNetAddr(aAddr, &addr);
|
NetAddrToPRNetAddr(aAddr, &addr);
|
||||||
|
|
||||||
if (PR_Bind(mFD, &addr) != PR_SUCCESS)
|
if (PR_Bind(mFD, &addr) != PR_SUCCESS)
|
||||||
|
@ -720,6 +721,7 @@ nsUDPSocket::Connect(const NetAddr *aAddr)
|
||||||
}
|
}
|
||||||
|
|
||||||
PRNetAddr prAddr;
|
PRNetAddr prAddr;
|
||||||
|
memset(&prAddr, 0, sizeof(prAddr));
|
||||||
NetAddrToPRNetAddr(aAddr, &prAddr);
|
NetAddrToPRNetAddr(aAddr, &prAddr);
|
||||||
|
|
||||||
if (PR_Connect(mFD, &prAddr, PR_INTERVAL_NO_WAIT) != PR_SUCCESS) {
|
if (PR_Connect(mFD, &prAddr, PR_INTERVAL_NO_WAIT) != PR_SUCCESS) {
|
||||||
|
|
Загрузка…
Ссылка в новой задаче