[libcxx] Make std::basic_istream::get 0-terminate input array in case of error.

It covers the cases when the sentry object returns false and when an exception
was thrown. Corresponding standard paragraph is C++14 [istream.unformatted]p9:
  [...] In any case, if n is greater than zero it then stores a null
  character into the next successive location of the array.

rdar://problem/35566567

Reviewers: EricWF, mclow.lists

Reviewed By: mclow.lists

Subscribers: cfe-commits

Differential Revision: https://reviews.llvm.org/D40677


git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@322326 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Volodymyr Sapsai
2018-01-11 23:23:49 +00:00
parent d09b2ed53e
commit 68050ff61f
3 changed files with 128 additions and 1 deletions

View File

@@ -7,6 +7,14 @@
//
//===----------------------------------------------------------------------===//
// XFAIL: with_system_cxx_lib=macosx10.13
// XFAIL: with_system_cxx_lib=macosx10.12
// XFAIL: with_system_cxx_lib=macosx10.11
// XFAIL: with_system_cxx_lib=macosx10.10
// XFAIL: with_system_cxx_lib=macosx10.9
// XFAIL: with_system_cxx_lib=macosx10.8
// XFAIL: with_system_cxx_lib=macosx10.7
// <istream>
// basic_istream<charT,traits>& get(char_type* s, streamsize n);
@@ -14,6 +22,8 @@
#include <istream>
#include <cassert>
#include "test_macros.h"
template <class CharT>
struct testbuf
: public std::basic_streambuf<CharT>
@@ -67,7 +77,33 @@ int main()
assert(!is.fail());
assert(std::string(s) == " ");
assert(is.gcount() == 1);
// Check that even in error case the buffer is properly 0-terminated.
is.get(s, 5);
assert( is.eof());
assert( is.fail());
assert(std::string(s) == "");
assert(is.gcount() == 0);
}
#ifndef TEST_HAS_NO_EXCEPTIONS
{
testbuf<char> sb(" ");
std::istream is(&sb);
char s[5] = "test";
is.exceptions(std::istream::eofbit | std::istream::badbit);
try
{
is.get(s, 5);
assert(false);
}
catch (std::ios_base::failure&)
{
}
assert( is.eof());
assert( is.fail());
assert(std::string(s) == " ");
assert(is.gcount() == 1);
}
#endif
{
testbuf<wchar_t> sb(L" \n \n ");
std::wistream is(&sb);
@@ -95,5 +131,31 @@ int main()
assert(!is.fail());
assert(std::wstring(s) == L" ");
assert(is.gcount() == 1);
// Check that even in error case the buffer is properly 0-terminated.
is.get(s, 5);
assert( is.eof());
assert( is.fail());
assert(std::wstring(s) == L"");
assert(is.gcount() == 0);
}
#ifndef TEST_HAS_NO_EXCEPTIONS
{
testbuf<wchar_t> sb(L" ");
std::wistream is(&sb);
wchar_t s[5] = L"test";
is.exceptions(std::wistream::eofbit | std::wistream::badbit);
try
{
is.get(s, 5);
assert(false);
}
catch (std::ios_base::failure&)
{
}
assert( is.eof());
assert( is.fail());
assert(std::wstring(s) == L" ");
assert(is.gcount() == 1);
}
#endif
}

View File

@@ -7,6 +7,14 @@
//
//===----------------------------------------------------------------------===//
// XFAIL: with_system_cxx_lib=macosx10.13
// XFAIL: with_system_cxx_lib=macosx10.12
// XFAIL: with_system_cxx_lib=macosx10.11
// XFAIL: with_system_cxx_lib=macosx10.10
// XFAIL: with_system_cxx_lib=macosx10.9
// XFAIL: with_system_cxx_lib=macosx10.8
// XFAIL: with_system_cxx_lib=macosx10.7
// <istream>
// basic_istream<charT,traits>& get(char_type* s, streamsize n, char_type delim);
@@ -14,6 +22,8 @@
#include <istream>
#include <cassert>
#include "test_macros.h"
template <class CharT>
struct testbuf
: public std::basic_streambuf<CharT>
@@ -67,7 +77,33 @@ int main()
assert(!is.fail());
assert(std::string(s) == " ");
assert(is.gcount() == 1);
// Check that even in error case the buffer is properly 0-terminated.
is.get(s, 5, '*');
assert( is.eof());
assert( is.fail());
assert(std::string(s) == "");
assert(is.gcount() == 0);
}
#ifndef TEST_HAS_NO_EXCEPTIONS
{
testbuf<char> sb(" ");
std::istream is(&sb);
char s[5] = "test";
is.exceptions(std::istream::eofbit | std::istream::badbit);
try
{
is.get(s, 5, '*');
assert(false);
}
catch (std::ios_base::failure&)
{
}
assert( is.eof());
assert( is.fail());
assert(std::string(s) == " ");
assert(is.gcount() == 1);
}
#endif
{
testbuf<wchar_t> sb(L" * * ");
std::wistream is(&sb);
@@ -95,5 +131,31 @@ int main()
assert(!is.fail());
assert(std::wstring(s) == L" ");
assert(is.gcount() == 1);
// Check that even in error case the buffer is properly 0-terminated.
is.get(s, 5, L'*');
assert( is.eof());
assert( is.fail());
assert(std::wstring(s) == L"");
assert(is.gcount() == 0);
}
#ifndef TEST_HAS_NO_EXCEPTIONS
{
testbuf<wchar_t> sb(L" ");
std::wistream is(&sb);
wchar_t s[5] = L"test";
is.exceptions(std::wistream::eofbit | std::wistream::badbit);
try
{
is.get(s, 5, L'*');
assert(false);
}
catch (std::ios_base::failure&)
{
}
assert( is.eof());
assert( is.fail());
assert(std::wstring(s) == L" ");
assert(is.gcount() == 1);
}
#endif
}