Commit 396a9705 authored by Jesse Beder's avatar Jesse Beder
Browse files

Fix SEGV in ostream_wrapper

parent db82302e
......@@ -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) {
......
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})
......
#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());
}
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment