summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarshall Clow <mclow.lists@gmail.com>2019-01-08 02:48:45 +0000
committerMarshall Clow <mclow.lists@gmail.com>2019-01-08 02:48:45 +0000
commit8f9346922c2e9a8dff14cbaeb2b2eb7646b49ba3 (patch)
tree67450b77c68d8f405cfb36507aefe9cf23c3fe6a
parent43cba997757ded62277e8a3658d86f2e2bf42b05 (diff)
downloadbcm5719-llvm-8f9346922c2e9a8dff14cbaeb2b2eb7646b49ba3.tar.gz
bcm5719-llvm-8f9346922c2e9a8dff14cbaeb2b2eb7646b49ba3.zip
Set the buffer of an fstream to empty when the underlying file is closed. This 'fixes' PR#38052 - std::fstream still good after closing and updating content.
llvm-svn: 350603
-rw-r--r--libcxx/include/fstream1
-rw-r--r--libcxx/test/libcxx/input.output/file.streams/fstreams/fstream.close.pass.cpp35
2 files changed, 36 insertions, 0 deletions
diff --git a/libcxx/include/fstream b/libcxx/include/fstream
index 332b4747c1a..711e484e2dc 100644
--- a/libcxx/include/fstream
+++ b/libcxx/include/fstream
@@ -702,6 +702,7 @@ basic_filebuf<_CharT, _Traits>::close()
__file_ = 0;
else
__rt = 0;
+ setbuf(0, 0);
}
return __rt;
}
diff --git a/libcxx/test/libcxx/input.output/file.streams/fstreams/fstream.close.pass.cpp b/libcxx/test/libcxx/input.output/file.streams/fstreams/fstream.close.pass.cpp
new file mode 100644
index 00000000000..0f8defcbd97
--- /dev/null
+++ b/libcxx/test/libcxx/input.output/file.streams/fstreams/fstream.close.pass.cpp
@@ -0,0 +1,35 @@
+//===----------------------------------------------------------------------===//
+//
+// The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+// <fstream>
+
+// template <class charT, class traits = char_traits<charT> >
+// class basic_fstream
+
+// close();
+
+// Inspired by PR#38052 - std::fstream still good after closing and updating content
+
+#include <fstream>
+#include <cassert>
+#include "platform_support.h"
+
+int main()
+{
+ std::string temp = get_temp_file_name();
+
+ std::fstream ofs(temp, std::ios::out | std::ios::trunc);
+ ofs << "Hello, World!\n";
+ assert( ofs.good());
+ ofs.close();
+ assert( ofs.good());
+ ofs << "Hello, World!\n";
+ assert(!ofs.good());
+
+ std::remove(temp.c_str());
+}
OpenPOWER on IntegriCloud