wbtiger
/
foundationdb
mirror of https://github.com/apple/foundationdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix the bug of variable int32 overflow. 

1.the content length from http response transformed using 'atoi' would rise int32 overflow.
2.the offset's aligning would rise int32 overflow.
This commit is contained in:
Huiyoung 2022-11-29 15:40:03 +08:00
parent 48cecc8bce
commit a71d985518
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fdbrpc/HTTP.actor.cpp
View File

@ -243,7 +243,7 @@ ACTOR Future<Void> read_http_response(Reference<HTTP::Response> r, Reference<ICo
auto i = r->headers.find("Content-Length"); auto i = r->headers.find("Content-Length");
if (i != r->headers.end()) if (i != r->headers.end())
r->contentLen = atoi(i->second.c_str()); r->contentLen = strtoll(i->second.c_str(), NULL, 10);
else else
r->contentLen = -1; // Content length unknown r->contentLen = -1; // Content length unknown
@ -481,7 +481,7 @@ ACTOR Future<Reference<HTTP::Response>> doRequest(Reference<IConnection> conn,
} }
if (FLOW_KNOBS->HTTP_VERBOSE_LEVEL > 0) { if (FLOW_KNOBS->HTTP_VERBOSE_LEVEL > 0) {
printf("[%s] HTTP %scode=%d early=%d, time=%fs %s %s contentLen=%d [%d out, response content len %d]\n", printf("[%s] HTTP %scode=%d early=%d, time=%fs %s %s contentLen=%d [%d out, response content len %lld]\n",
conn->getDebugID().toString().c_str(), conn->getDebugID().toString().c_str(),
(err.present() ? format("*ERROR*=%s ", err.get().name()).c_str() : ""), (err.present() ? format("*ERROR*=%s ", err.get().name()).c_str() : ""),
r->code, r->code,
@ -491,7 +491,7 @@ ACTOR Future<Reference<HTTP::Response>> doRequest(Reference<IConnection> conn,
resource.c_str(), resource.c_str(),
contentLen, contentLen,
total_sent, total_sent,
(int)r->contentLen); r->contentLen);
} }
if (FLOW_KNOBS->HTTP_VERBOSE_LEVEL > 2) { if (FLOW_KNOBS->HTTP_VERBOSE_LEVEL > 2) {
printf("[%s] HTTP RESPONSE: %s %s\n%s\n", printf("[%s] HTTP RESPONSE: %s %s\n%s\n",

4
fdbrpc/include/fdbrpc/AsyncFileReadAhead.actor.h
View File

@ -102,7 +102,7 @@ public:
// If not found, start the read. // If not found, start the read.
if (i == f->m_blocks.end() || (i->second.isValid() && i->second.isError())) { if (i == f->m_blocks.end() || (i->second.isValid() && i->second.isError())) {
// printf("starting read of %s block %d\n", f->getFilename().c_str(), blockNum); // printf("starting read of %s block %d\n", f->getFilename().c_str(), blockNum);
fblock = readBlock(f.getPtr(), f->m_block_size, f->m_block_size * blockNum); fblock = readBlock(f.getPtr(), f->m_block_size, (int64_t)f->m_block_size * blockNum);
f->m_blocks[blockNum] = fblock; f->m_blocks[blockNum] = fblock;
} else } else
fblock = i->second; fblock = i->second;
@ -121,7 +121,7 @@ public:
// Calculate the block-relative read range. It's a given that the offset / length range touches this block // Calculate the block-relative read range. It's a given that the offset / length range touches this block
// so readStart will never be greater than blocksize (though it could be past the actual end of a short // so readStart will never be greater than blocksize (though it could be past the actual end of a short
// block). // block).
int64_t blockStart = blockNum * f->m_block_size; int64_t blockStart = (int64_t)blockNum * f->m_block_size;
int64_t readStart = std::max<int64_t>(0, offset - blockStart); int64_t readStart = std::max<int64_t>(0, offset - blockStart);
int64_t readEnd = std::min<int64_t>(f->m_block_size, offset + length - blockStart); int64_t readEnd = std::min<int64_t>(f->m_block_size, offset + length - blockStart);
int rlen = readEnd - readStart; int rlen = readEnd - readStart;