Fix SEGV in ostream_wrapper

src/ostream_wrapper.cpp

@@ -4,7 +4,12 @@
 
 namespace YAML {
 ostream_wrapper::ostream_wrapper()
-    : m_pStream(0), m_pos(0), m_row(0), m_col(0), m_comment(false) {}
+    : m_buffer(1, '\0'),
+      m_pStream(0),
+      m_pos(0),
+      m_row(0),
+      m_col(0),
+      m_comment(false) {}
 
 ostream_wrapper::ostream_wrapper(std::ostream& stream)
     : m_pStream(&stream), m_pos(0), m_row(0), m_col(0), m_comment(false) {}
@@ -19,9 +24,10 @@ void ostream_wrapper::write(const std::string& str) {
     std::copy(str.begin(), str.end(), &m_buffer[m_pos]);
   }
 
-  for (std::size_t i = 0; i < str.size(); i++)
+  for (std::size_t i = 0; i < str.size(); i++) {
     update_pos(str[i]);
   }
+}
 
 void ostream_wrapper::write(const char* str, std::size_t size) {
   if (m_pStream) {
@@ -31,9 +37,10 @@ void ostream_wrapper::write(const char* str, std::size_t size) {
     std::copy(str, str + size, &m_buffer[m_pos]);
   }
 
-  for (std::size_t i = 0; i < size; i++)
+  for (std::size_t i = 0; i < size; i++) {
     update_pos(str[i]);
   }
+}
 
 void ostream_wrapper::update_pos(char ch) {
   m_pos++;

test/CMakeLists.txt

@@ -1,8 +1,8 @@
 add_subdirectory(gtest-1.7.0)
 include_directories(gtest-1.7.0/include)
 
-file(GLOB test_headers [a-z]*.h)
+file(GLOB test_headers [a-z_]*.h)
-file(GLOB test_sources [a-z]*.cpp)
+file(GLOB test_sources [a-z_]*.cpp)
 file(GLOB test_core_sources core/[a-z]*.cpp)
 
 list(APPEND test_sources ${test_core_sources})

test/ostream_wrapper_test.cpp

@@ -0,0 +1,15 @@
+#include "yaml-cpp/ostream_wrapper.h"
+
+#include "gtest/gtest.h"
+
+namespace {
+class OstreamWrapperTest : public ::testing::Test {
+ protected:
+};
+
+// Tests that the Foo::Bar() method does Abc.
+TEST_F(OstreamWrapperTest, ConstructNoWrite) {
+  YAML::ostream_wrapper wrapper;
+  EXPECT_STREQ("", wrapper.str());
+}
+}