Fix two issues (aws#189)

(1) Missing initializer issues for gcc 4.9.4.
(2) StdIOStreamInputStream::ReadImpl() should return true when attempting to read bytes from empty stream.

Author: wps132230

crt/aws-c-auth

@@ -125,7 +125,12 @@ namespace Aws
              */
             struct AWS_CRT_CPP_API CredentialsProviderStaticConfig
             {
-                CredentialsProviderStaticConfig() : AccessKeyId{}, SecretAccessKey{}, SessionToken{} {}
+                CredentialsProviderStaticConfig()
+                {
+                    AWS_ZERO_STRUCT(AccessKeyId);
+                    AWS_ZERO_STRUCT(SecretAccessKey);
+                    AWS_ZERO_STRUCT(SessionToken);
+                }
 
                 /**
                  * The value of the access key component for the provider's static aws credentials
@@ -149,8 +154,10 @@ namespace Aws
             struct AWS_CRT_CPP_API CredentialsProviderProfileConfig
             {
                 CredentialsProviderProfileConfig()
-                    : ProfileNameOverride{}, ConfigFileNameOverride{}, CredentialsFileNameOverride{}
                 {
+                    AWS_ZERO_STRUCT(ProfileNameOverride);
+                    AWS_ZERO_STRUCT(ConfigFileNameOverride);
+                    AWS_ZERO_STRUCT(CredentialsFileNameOverride);
                 }
 
                 /**

crt/aws-c-cal

@@ -114,7 +114,7 @@ namespace Aws
                 auto read = m_stream->gcount();
                 buffer.len += static_cast<size_t>(read);
 
-                if (read > 0)
+                if (read > 0 || (read == 0 && m_stream->eof()))
                 {
                     return true;
                 }

include/aws/crt/auth/Credentials.h

@@ -37,6 +37,7 @@ add_test_case(OptionalCopyAndMoveSemantics)
 add_test_case(StreamTestCreateDestroyWrapper)
 add_test_case(StreamTestLength)
 add_test_case(StreamTestRead)
+add_test_case(StreamTestReadEmpty)
 add_test_case(StreamTestSeekBegin)
 add_test_case(StreamTestSeekEnd)
 add_test_case(TestCredentialsConstruction)

source/io/Stream.cpp

@@ -72,7 +72,7 @@ static int s_StreamTestRead(struct aws_allocator *allocator, void *ctx)
         AWS_ZERO_STRUCT(buffer);
         aws_byte_buf_init(&buffer, allocator, 256);
 
-        aws_input_stream_read(wrappedStream.GetUnderlyingStream(), &buffer);
+        ASSERT_SUCCESS(aws_input_stream_read(wrappedStream.GetUnderlyingStream(), &buffer));
 
         ASSERT_TRUE(buffer.len == strlen(STREAM_CONTENTS));
         ASSERT_BIN_ARRAYS_EQUALS(STREAM_CONTENTS, buffer.len, buffer.buffer, buffer.len);
@@ -87,6 +87,34 @@ static int s_StreamTestRead(struct aws_allocator *allocator, void *ctx)
 
 AWS_TEST_CASE(StreamTestRead, s_StreamTestRead)
 
+static int s_StreamTestReadEmpty(struct aws_allocator *allocator, void *ctx)
+{
+    (void)ctx;
+    {
+        Aws::Crt::ApiHandle apiHandle(allocator);
+
+        auto stringStream = Aws::Crt::MakeShared<Aws::Crt::StringStream>(allocator, "");
+
+        Aws::Crt::Io::StdIOStreamInputStream wrappedStream(stringStream, allocator);
+
+        aws_byte_buf buffer;
+        AWS_ZERO_STRUCT(buffer);
+        aws_byte_buf_init(&buffer, allocator, 256);
+
+        ASSERT_SUCCESS(aws_input_stream_read(wrappedStream.GetUnderlyingStream(), &buffer));
+
+        ASSERT_TRUE(buffer.len == 0);
+
+        aws_byte_buf_clean_up(&buffer);
+    }
+
+    Aws::Crt::TestCleanupAndWait();
+
+    return AWS_OP_SUCCESS;
+}
+
+AWS_TEST_CASE(StreamTestReadEmpty, s_StreamTestReadEmpty)
+
 static const aws_off_t BEGIN_SEEK_OFFSET = 4;
 
 static int s_StreamTestSeekBegin(struct aws_allocator *allocator, void *ctx)
@@ -105,7 +133,7 @@ static int s_StreamTestSeekBegin(struct aws_allocator *allocator, void *ctx)
         AWS_ZERO_STRUCT(buffer);
         aws_byte_buf_init(&buffer, allocator, 256);
 
-        aws_input_stream_read(wrappedStream.GetUnderlyingStream(), &buffer);
+        ASSERT_SUCCESS(aws_input_stream_read(wrappedStream.GetUnderlyingStream(), &buffer));
 
         ASSERT_TRUE(buffer.len == strlen(STREAM_CONTENTS) - BEGIN_SEEK_OFFSET);
         ASSERT_BIN_ARRAYS_EQUALS(STREAM_CONTENTS + BEGIN_SEEK_OFFSET, buffer.len, buffer.buffer, buffer.len);
@@ -138,7 +166,7 @@ static int s_StreamTestSeekEnd(struct aws_allocator *allocator, void *ctx)
         AWS_ZERO_STRUCT(buffer);
         aws_byte_buf_init(&buffer, allocator, 256);
 
-        aws_input_stream_read(wrappedStream.GetUnderlyingStream(), &buffer);
+        ASSERT_SUCCESS(aws_input_stream_read(wrappedStream.GetUnderlyingStream(), &buffer));
 
         ASSERT_TRUE(buffer.len == -END_SEEK_OFFSET);
         ASSERT_BIN_ARRAYS_EQUALS(