kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

CTest: Fix integer overflow when uploading huge files 

When uploading files greater 2GB a cast to 'int' overflows, leading to a
bad alloc when passed to new. Also avoid floating point arithmetic when
integer calculations will work as well.

Reported-by: Justin Borodinsky <justin.borodinsky@gmail.com>
This commit is contained in:
Rolf Eike Beer 2014-12-22 21:56:14 +01:00
parent 1819d4ad1f
commit a9fae8ac1d
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/cmCTest.cxx
View File

@ -1688,7 +1688,7 @@ std::string cmCTest::Base64GzipEncodeFile(std::string file)
//---------------------------------------------------------------------- //----------------------------------------------------------------------
std::string cmCTest::Base64EncodeFile(std::string file) std::string cmCTest::Base64EncodeFile(std::string file)
{ {
long len = cmSystemTools::FileLength(file); size_t const len = cmSystemTools::FileLength(file);
cmsys::ifstream ifs(file.c_str(), std::ios::in cmsys::ifstream ifs(file.c_str(), std::ios::in
#ifdef _WIN32 #ifdef _WIN32
| std::ios::binary | std::ios::binary
@ -1699,8 +1699,7 @@ std::string cmCTest::Base64EncodeFile(std::string file)
ifs.close(); ifs.close();
unsigned char *encoded_buffer unsigned char *encoded_buffer
= new unsigned char [ static_cast<int>( = new unsigned char [ (len * 3) / 2 + 5 ];
static_cast<double>(len) * 1.5 + 5.0) ];
unsigned long rlen unsigned long rlen
= cmsysBase64_Encode(file_buffer, len, encoded_buffer, 1); = cmsysBase64_Encode(file_buffer, len, encoded_buffer, 1);
@ -3192,7 +3191,7 @@ bool cmCTest::CompressString(std::string& str)
// Now base64 encode the resulting binary string // Now base64 encode the resulting binary string
unsigned char* base64EncodedBuffer unsigned char* base64EncodedBuffer
= new unsigned char[static_cast<int>(outSize * 1.5)]; = new unsigned char[(outSize * 3) / 2];
unsigned long rlen unsigned long rlen
= cmsysBase64_Encode(out, strm.total_out, base64EncodedBuffer, 1); = cmsysBase64_Encode(out, strm.total_out, base64EncodedBuffer, 1);