summaryrefslogtreecommitdiffstats
path: root/Source/CTest/cmCTestRunTest.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-01-08 19:57:41 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2015-01-08 19:57:41 (GMT)
commitdc451574c67da688024d5f3686c7c2aa4c5040ba (patch)
tree407db74b018131fee19cc6340d008490f3b1f733 /Source/CTest/cmCTestRunTest.cxx
parent9bb7f8f8982d1d73ca4d4ee108f3f2505e01ee7e (diff)
parent0bdd4ebfb8303cc46e4a8bbe16f6c7bcc7108e2a (diff)
downloadCMake-dc451574c67da688024d5f3686c7c2aa4c5040ba.zip
CMake-dc451574c67da688024d5f3686c7c2aa4c5040ba.tar.gz
CMake-dc451574c67da688024d5f3686c7c2aa4c5040ba.tar.bz2
Merge topic 'base64-casts'
0bdd4ebf cmCTest: Use size_t for cmsysBase64_Encode return value a9fae8ac CTest: Fix integer overflow when uploading huge files
Diffstat (limited to 'Source/CTest/cmCTestRunTest.cxx')
-rw-r--r--Source/CTest/cmCTestRunTest.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/CTest/cmCTestRunTest.cxx b/Source/CTest/cmCTestRunTest.cxx
index 9e3c9fc..ff55528 100644
--- a/Source/CTest/cmCTestRunTest.cxx
+++ b/Source/CTest/cmCTestRunTest.cxx
@@ -116,10 +116,10 @@ void cmCTestRunTest::CompressOutput()
unsigned char *encoded_buffer
= new unsigned char[static_cast<int>(outSize * 1.5)];
- unsigned long rlen
+ size_t rlen
= cmsysBase64_Encode(out, strm.total_out, encoded_buffer, 1);
- for(unsigned long i = 0; i < rlen; i++)
+ for(size_t i = 0; i < rlen; i++)
{
this->CompressedOutput += encoded_buffer[i];
}