Seeking zero from the end of a PreallocatedStreamBuf should work properly

Author: Bret Ambrose

aws-cpp-sdk-core-tests/utils/stream/PreallocatedStreamBufTest.cpp

@@ -162,4 +162,21 @@ TEST(PreallocatedStreamBufTest, TestStreamWriteHonorsSizeLimitShorterThanBuffer)
     buffer[sizeof(bufferStr) - 5] = 0;
     ioStream.write(bufferStr, sizeof(bufferStr));
     ASSERT_STREQ(shortenedBuffer, (const char*)buffer.GetUnderlyingData());
-}
+}
+
+TEST(PreallocatedStreamBufTest, TestZeroLengthSeekFromEnd)
+{
+    Array<uint8_t> buffer((uint8_t*)bufferStr, sizeof(bufferStr));
+    PreallocatedStreamBuf streamBuf(&buffer, buffer.GetLength());
+    Aws::IOStream ioStream(&streamBuf);
+
+    ioStream.seekg(0, std::ios_base::end);
+    ASSERT_FALSE(ioStream.eof());
+
+    // attempting to read a character should fail and hit eof since we're one position after
+    // the last character
+    char ch = 0;
+    ioStream.get(ch);
+    // could check ch == 0 but I don't think the standard guarantees that
+    ASSERT_TRUE(ioStream.eof());
+}

aws-cpp-sdk-core/source/utils/stream/PreallocatedStreamBuf.cpp

@@ -60,8 +60,8 @@ namespace Aws
 
             PreallocatedStreamBuf::pos_type PreallocatedStreamBuf::seekpos(pos_type pos, std::ios_base::openmode which)
             {
-                assert(static_cast<size_t>(pos) < m_lengthToRead);
-                if (static_cast<size_t>(pos) >= m_lengthToRead)
+                assert(static_cast<size_t>(pos) <= m_lengthToRead);
+                if (static_cast<size_t>(pos) > m_lengthToRead)
                 {
                     return pos_type(off_type(-1));
                 }

aws-cpp-sdk-transfer-tests/TransferTests.cpp

@@ -346,12 +346,6 @@ TEST_F(TransferTests, TransferManager_SinglePartUploadTest)
 
     TransferManagerConfiguration transferManagerConfig;
     transferManagerConfig.s3Client = m_s3Client;
-    transferManagerConfig.uploadProgressCallback =
-        [](const TransferManager*, const TransferHandle& handle)
-    { std::cout << "Upload Progress: " << handle.GetBytesTransferred() << " of " << handle.GetBytesTotalSize() << " bytes\n";};
-    transferManagerConfig.downloadProgressCallback =
-        [](const TransferManager*, const TransferHandle& handle)
-    { std::cout << "Download Progress: " << handle.GetBytesTransferred() << " of " << handle.GetBytesTotalSize() << " bytes\n"; };
     TransferManager transferManager(transferManagerConfig);
 
     // Test with default behavior of using file name as key
@@ -506,12 +500,7 @@ TEST_F(TransferTests, TransferManager_MediumTest)
 
     TransferManagerConfiguration transferManagerConfig;
     transferManagerConfig.s3Client = m_s3Client;
-    transferManagerConfig.uploadProgressCallback =
-        [](const TransferManager*, const TransferHandle& handle)
-    { std::cout << "Upload Progress: " << handle.GetBytesTransferred() << " of " << handle.GetBytesTotalSize() << " bytes\n"; };
-    transferManagerConfig.downloadProgressCallback =
-        [](const TransferManager*, const TransferHandle& handle)
-    { std::cout << "Download Progress: " << handle.GetBytesTransferred() << " of " << handle.GetBytesTotalSize() << " bytes\n"; };
+
     TransferManager transferManager(transferManagerConfig);
     std::shared_ptr<TransferHandle> requestPtr = transferManager.UploadFile(MEDIUM_TEST_FILE_NAME, GetTestBucketName(), MEDIUM_FILE_KEY, "text/plain", Aws::Map<Aws::String, Aws::String>());
 
@@ -582,12 +571,6 @@ TEST_F(TransferTests, TransferManager_BigTest)
 
     TransferManagerConfiguration transferManagerConfig;
     transferManagerConfig.s3Client = m_s3Client;
-    transferManagerConfig.uploadProgressCallback = 
-        [](const TransferManager*, const TransferHandle& handle) 
-        { std::cout << "Upload Progress: " << handle.GetBytesTransferred() << " of " <<  handle.GetBytesTotalSize() << " bytes\n"; };
-    transferManagerConfig.downloadProgressCallback = 
-        [](const TransferManager*, const TransferHandle& handle) 
-        { std::cout << "Download Progress: " << handle.GetBytesTransferred() << " of "<<  handle.GetBytesTotalSize() << " bytes\n"; };
 
     TransferManager transferManager(transferManagerConfig);
     std::shared_ptr<TransferHandle> requestPtr = transferManager.UploadFile(BIG_TEST_FILE_NAME, GetTestBucketName(), BIG_FILE_KEY, "text/plain", Aws::Map<Aws::String, Aws::String>());
@@ -672,12 +655,6 @@ TEST_F(TransferTests, TransferManager_CancelAndRetryTest)
                 }
             }
         };
-    transferManagerConfig.uploadProgressCallback =
-        [](const TransferManager*, const TransferHandle& handle)
-    { std::cout << "Upload Progress: " << handle.GetBytesTransferred() << " of " << handle.GetBytesTotalSize() << " bytes\n"; };
-    transferManagerConfig.downloadProgressCallback =
-        [](const TransferManager*, const TransferHandle& handle)
-    { std::cout << "Download Progress: " << handle.GetBytesTransferred() << " of " << handle.GetBytesTotalSize() << " bytes\n"; };
 
     transferManagerConfig.s3Client = m_s3Client;
     TransferManager transferManager(transferManagerConfig);
@@ -774,12 +751,6 @@ TEST_F(TransferTests, TransferManager_AbortAndRetryTest)
             }
         }
     };
-    transferManagerConfig.uploadProgressCallback =
-        [](const TransferManager*, const TransferHandle& handle)
-    { std::cout << "Upload Progress: " << handle.GetBytesTransferred() << " of " << handle.GetBytesTotalSize() << " bytes\n"; };
-    transferManagerConfig.downloadProgressCallback =
-        [](const TransferManager*, const TransferHandle& handle)
-    { std::cout << "Download Progress: " << handle.GetBytesTransferred() << " of " << handle.GetBytesTotalSize() << " bytes\n"; };
 
     transferManagerConfig.s3Client = m_s3Client;
     TransferManager transferManager(transferManagerConfig);