encoding: OBufferStream closes stream in destructor
This avoids use-after-free error from base class destructor.
refs #3727
Change-Id: Ie9abde981fe98dcb1bc541858ed03afbaae56ad1
diff --git a/src/encoding/buffer-stream.cpp b/src/encoding/buffer-stream.cpp
index e60ba77..3fed843 100644
--- a/src/encoding/buffer-stream.cpp
+++ b/src/encoding/buffer-stream.cpp
@@ -45,6 +45,11 @@
open(m_device);
}
+OBufferStream::~OBufferStream()
+{
+ close();
+}
+
shared_ptr<Buffer>
OBufferStream::buf()
{
diff --git a/src/encoding/buffer-stream.hpp b/src/encoding/buffer-stream.hpp
index b813e49..e7dc60f 100644
--- a/src/encoding/buffer-stream.hpp
+++ b/src/encoding/buffer-stream.hpp
@@ -72,6 +72,8 @@
public:
OBufferStream();
+ ~OBufferStream();
+
/**
* Flush written data to the stream and return shared pointer to the underlying buffer
*/
diff --git a/tests/unit-tests/encoding/buffer-stream.t.cpp b/tests/unit-tests/encoding/buffer-stream.t.cpp
new file mode 100644
index 0000000..2e37e25
--- /dev/null
+++ b/tests/unit-tests/encoding/buffer-stream.t.cpp
@@ -0,0 +1,74 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/**
+ * Copyright (c) 2013-2016 Regents of the University of California.
+ *
+ * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
+ *
+ * ndn-cxx library is free software: you can redistribute it and/or modify it under the
+ * terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later version.
+ *
+ * ndn-cxx library is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ *
+ * You should have received copies of the GNU General Public License and GNU Lesser
+ * General Public License along with ndn-cxx, e.g., in COPYING.md file. If not, see
+ * <http://www.gnu.org/licenses/>.
+ *
+ * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
+ */
+
+#include "encoding/buffer-stream.hpp"
+
+#include "boost-test.hpp"
+
+namespace ndn {
+namespace tests {
+
+BOOST_AUTO_TEST_SUITE(Encoding)
+BOOST_AUTO_TEST_SUITE(TestBufferStream)
+
+BOOST_AUTO_TEST_CASE(Empty)
+{
+ OBufferStream os;
+
+ shared_ptr<Buffer> buf = os.buf();
+ BOOST_CHECK_EQUAL(buf->size(), 0);
+}
+
+BOOST_AUTO_TEST_CASE(Put)
+{
+ OBufferStream os;
+ os.put(0x33);
+ os.put(0x44);
+
+ shared_ptr<Buffer> buf = os.buf();
+ BOOST_REQUIRE_EQUAL(buf->size(), 2);
+ BOOST_CHECK_EQUAL(buf->at(0), 0x33);
+ BOOST_CHECK_EQUAL(buf->at(1), 0x44);
+}
+
+BOOST_AUTO_TEST_CASE(Write)
+{
+ OBufferStream os;
+ os.write("\x11\x22", 2);
+
+ shared_ptr<Buffer> buf = os.buf();
+ BOOST_REQUIRE_EQUAL(buf->size(), 2);
+ BOOST_CHECK_EQUAL(buf->at(0), 0x11);
+ BOOST_CHECK_EQUAL(buf->at(1), 0x22);
+}
+
+BOOST_AUTO_TEST_CASE(Destructor) // Bug 3727
+{
+ auto os = make_unique<OBufferStream>();
+ *os << 'x';
+ os.reset(); // should not cause use-after-free
+}
+
+BOOST_AUTO_TEST_SUITE_END() // TestBufferStream
+BOOST_AUTO_TEST_SUITE_END() // Encoding
+
+} // namespace tests
+} // namespace ndn