github
/
aria2
mirror of https://github.com/aria2/aria2
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix char appending to sstream and res len counting

pull/1857/head
myl7 2021-12-26 20:18:43 +08:00
parent 9061677c0e
commit ddabffd443
No known key found for this signature in database
GPG Key ID: 04F1013B67177C88
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/SocksProxySocket.cc
View File

@ -115,7 +115,7 @@ SocksProxySocket::startUdpAssociate(const std::string& listenAddr,
std::pair<std::string*, uint16_t*> bnd) std::pair<std::string*, uint16_t*> bnd)
{ {
std::stringstream req; std::stringstream req;
req << C_SOCKS_VER << C_CMD_UDP_ASSOCIATE << 0; req << C_SOCKS_VER << C_CMD_UDP_ASSOCIATE << '\x00';
if (family_ == AF_INET) { if (family_ == AF_INET) {
if (!listenAddr.empty()) { if (!listenAddr.empty()) {
char addrBuf[10]; char addrBuf[10];
@ -177,8 +177,8 @@ SocksProxySocket::startUdpAssociate(const std::string& listenAddr,
} }
else if (res[3] == C_ADDR_DOMAIN) { else if (res[3] == C_ADDR_DOMAIN) {
// 2 more bytes to hold port temporarily. // 2 more bytes to hold port temporarily.
bndAddr = std::string(res[4] + 2, 0); size_t resLen = res[4] + 2;
resLen = res[4] + 2; bndAddr = std::string(resLen, '\x00');
socket_->readData(&bndAddr[0], resLen); socket_->readData(&bndAddr[0], resLen);
bndPort = ntohs(*reinterpret_cast<uint16_t*>(&bndAddr[0] + res[4])); bndPort = ntohs(*reinterpret_cast<uint16_t*>(&bndAddr[0] + res[4]));
bndAddr.resize(res[4]); bndAddr.resize(res[4]);