From 396a97050dcf4b7b8f19f87044d6dcd10c3dc875 Mon Sep 17 00:00:00 2001
From: Jesse Beder <jbeder+github@gmail.com>
Date: Sat, 22 Mar 2014 19:15:49 -0500
Subject: [PATCH] Fix SEGV in ostream_wrapper

---
 src/ostream_wrapper.cpp       | 13 ++++++++++---
 test/CMakeLists.txt           |  4 ++--
 test/ostream_wrapper_test.cpp | 15 +++++++++++++++
 3 files changed, 27 insertions(+), 5 deletions(-)
 create mode 100644 test/ostream_wrapper_test.cpp

diff --git a/src/ostream_wrapper.cpp b/src/ostream_wrapper.cpp
index 3dc2efb..bf9aa6e 100644
--- a/src/ostream_wrapper.cpp
+++ b/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,8 +24,9 @@ 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) {
@@ -31,8 +37,9 @@ 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) {
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 1ea46e1..e885802 100644
--- a/test/CMakeLists.txt
+++ b/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_sources [a-z]*.cpp)
+file(GLOB test_headers [a-z_]*.h)
+file(GLOB test_sources [a-z_]*.cpp)
 file(GLOB test_core_sources core/[a-z]*.cpp)
 
 list(APPEND test_sources ${test_core_sources})
diff --git a/test/ostream_wrapper_test.cpp b/test/ostream_wrapper_test.cpp
new file mode 100644
index 0000000..4fbb4df
--- /dev/null
+++ b/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());
+}
+}