From patchwork Thu Aug 6 18:23:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 1341859 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gcc.gnu.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=pok3Pszc; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BMxhG0qdpz9sR4 for ; Fri, 7 Aug 2020 04:23:40 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id AAF073870848; Thu, 6 Aug 2020 18:23:38 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org AAF073870848 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1596738218; bh=dqXSilfy0as3mqEVq5A/OF40FrlaU+17HY06jNrJ4G4=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=pok3PszcV7KReBuHejUJCslSwqsVeUfQk+hCE57qXnDRWPmL73AmPiKFZc2qrkA4t VVEQ0QTssqVwIu69AFdwRVDt8gyGvt8wpVBRudPhqFK5ZOoeu6mCdDM6TJhaIFqhkp NSBsFbZL2JQabIrAcJAYLbQc4LDTfYMtejHAPgew= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by sourceware.org (Postfix) with ESMTP id 4CBCA3842401 for ; Thu, 6 Aug 2020 18:23:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 4CBCA3842401 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-197-Nj8GoezaMZKMNS1peCMFGQ-1; Thu, 06 Aug 2020 14:23:32 -0400 X-MC-Unique: Nj8GoezaMZKMNS1peCMFGQ-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C6D808014C1; Thu, 6 Aug 2020 18:23:31 +0000 (UTC) Received: from localhost (unknown [10.33.36.145]) by smtp.corp.redhat.com (Postfix) with ESMTP id 083FC5F9DC; Thu, 6 Aug 2020 18:23:30 +0000 (UTC) Date: Thu, 6 Aug 2020 19:23:30 +0100 To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Do not set eofbit eagerly in operator>>(istream&, char(&)[N]) Message-ID: <20200806182330.GA2397234@redhat.com> MIME-Version: 1.0 X-Clacks-Overhead: GNU Terry Pratchett X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline X-Spam-Status: No, score=-14.2 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Jonathan Wakely via Gcc-patches From: Jonathan Wakely Reply-To: Jonathan Wakely Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" Similar to the bugs I fixed recently in istream::ignore, we incorrectly set eofbit too often in operator>>(istream&, string&) and operator>>(istream&. char(&)[N]). We should only set eofbit if we reach EOF but would have kept going otherwise. If we've already extracted the maximum number of characters (whether that's because of the buffer size or the istream's width()) then we should not set eofbit. libstdc++-v3/ChangeLog: * include/bits/basic_string.tcc (operator>>(basic_istream&, basic_string&)): Do not set eofbit if extraction stopped after in.width() characters. * src/c++98/istream-string.cc (operator>>(istream&, string&)): Likewise. * include/bits/istream.tcc (__istream_extract): Do not set eofbit if extraction stopped after n-1 characters. * src/c++98/istream.cc (__istream_extract): Likewise. * testsuite/21_strings/basic_string/inserters_extractors/char/13.cc: New test. * testsuite/21_strings/basic_string/inserters_extractors/wchar_t/13.cc: New test. * testsuite/27_io/basic_istream/extractors_character/char/5.cc: New test. * testsuite/27_io/basic_istream/extractors_character/wchar_t/5.cc: New test. Tested powerpc64le-linux. Committed to trunk. commit 4e39f563c0cd25401f689c2093cb8c13692156ef Author: Jonathan Wakely Date: Thu Aug 6 19:23:14 2020 libstdc++: Do not set eofbit eagerly in operator>>(istream&, char(&)[N]) Similar to the bugs I fixed recently in istream::ignore, we incorrectly set eofbit too often in operator>>(istream&, string&) and operator>>(istream&. char(&)[N]). We should only set eofbit if we reach EOF but would have kept going otherwise. If we've already extracted the maximum number of characters (whether that's because of the buffer size or the istream's width()) then we should not set eofbit. libstdc++-v3/ChangeLog: * include/bits/basic_string.tcc (operator>>(basic_istream&, basic_string&)): Do not set eofbit if extraction stopped after in.width() characters. * src/c++98/istream-string.cc (operator>>(istream&, string&)): Likewise. * include/bits/istream.tcc (__istream_extract): Do not set eofbit if extraction stopped after n-1 characters. * src/c++98/istream.cc (__istream_extract): Likewise. * testsuite/21_strings/basic_string/inserters_extractors/char/13.cc: New test. * testsuite/21_strings/basic_string/inserters_extractors/wchar_t/13.cc: New test. * testsuite/27_io/basic_istream/extractors_character/char/5.cc: New test. * testsuite/27_io/basic_istream/extractors_character/wchar_t/5.cc: New test. diff --git a/libstdc++-v3/include/bits/basic_string.tcc b/libstdc++-v3/include/bits/basic_string.tcc index e370f439390..75218a40610 100644 --- a/libstdc++-v3/include/bits/basic_string.tcc +++ b/libstdc++-v3/include/bits/basic_string.tcc @@ -1518,7 +1518,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } __str.append(__buf, __len); - if (_Traits::eq_int_type(__c, __eof)) + if (__extracted < __n && _Traits::eq_int_type(__c, __eof)) __err |= __ios_base::eofbit; __in.width(0); } diff --git a/libstdc++-v3/include/bits/istream.tcc b/libstdc++-v3/include/bits/istream.tcc index b8f530f6ef5..022db9383e9 100644 --- a/libstdc++-v3/include/bits/istream.tcc +++ b/libstdc++-v3/include/bits/istream.tcc @@ -1023,7 +1023,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ++__extracted; __c = __sb->snextc(); } - if (_Traits::eq_int_type(__c, __eof)) + + if (__extracted < __num - 1 + && _Traits::eq_int_type(__c, __eof)) __err |= ios_base::eofbit; // _GLIBCXX_RESOLVE_LIB_DEFECTS diff --git a/libstdc++-v3/src/c++98/istream-string.cc b/libstdc++-v3/src/c++98/istream-string.cc index c59f2ce0b34..bfd7389e2e2 100644 --- a/libstdc++-v3/src/c++98/istream-string.cc +++ b/libstdc++-v3/src/c++98/istream-string.cc @@ -93,7 +93,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } } - if (__traits_type::eq_int_type(__c, __eof)) + if (__extracted < __n && __traits_type::eq_int_type(__c, __eof)) __err |= ios_base::eofbit; __in.width(0); } diff --git a/libstdc++-v3/src/c++98/istream.cc b/libstdc++-v3/src/c++98/istream.cc index 7a48779d337..79a77b8475a 100644 --- a/libstdc++-v3/src/c++98/istream.cc +++ b/libstdc++-v3/src/c++98/istream.cc @@ -261,7 +261,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } } - if (__traits_type::eq_int_type(__c, __eof)) + if (__extracted < __num - 1 + && __traits_type::eq_int_type(__c, __eof)) __err |= ios_base::eofbit; // _GLIBCXX_RESOLVE_LIB_DEFECTS diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/char/13.cc b/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/char/13.cc new file mode 100644 index 00000000000..f54042a4604 --- /dev/null +++ b/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/char/13.cc @@ -0,0 +1,55 @@ +// Copyright (C) 2020 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This 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 General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +// { dg-do run } + +#include +#include +#include + +void +test01() +{ + const std::string str = "1234"; + std::istringstream in(str); + std::string buf; + in.width(4); + in >> buf; + VERIFY( !in.eof() ); // should stop after reading 4 chars + VERIFY( buf == str ); +} + +struct CT : std::char_traits { }; + +void +test02() +{ + const std::basic_string str = "1234"; + std::basic_istringstream in(str); + std::basic_string buf; + in.width(4); + in >> buf; + VERIFY( !in.eof() ); // should stop after reading 4 chars + VERIFY( buf == str ); +} + +int +main() +{ + test01(); + test02(); +} diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/wchar_t/13.cc b/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/wchar_t/13.cc new file mode 100644 index 00000000000..f18e2cbe461 --- /dev/null +++ b/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/wchar_t/13.cc @@ -0,0 +1,55 @@ +// Copyright (C) 2020 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This 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 General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +// { dg-do run } + +#include +#include +#include + +void +test01() +{ + const std::wstring str = L"1234"; + std::wistringstream in(str); + std::wstring buf; + in.width(4); + in >> buf; + VERIFY( !in.eof() ); // should stop after reading 4 chars + VERIFY( buf == str ); +} + +struct WT : std::char_traits { }; + +void +test02() +{ + const std::basic_string str = L"1234"; + std::basic_istringstream in(str); + std::basic_string buf; + in.width(4); + in >> buf; + VERIFY( !in.eof() ); // should stop after reading 4 chars + VERIFY( buf == str ); +} + +int +main() +{ + test01(); + test02(); +} diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/char/5.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/char/5.cc new file mode 100644 index 00000000000..984f8815645 --- /dev/null +++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/char/5.cc @@ -0,0 +1,54 @@ +// Copyright (C) 2020 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This 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 General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +// { dg-do run } + +#include +#include + +void +test01() +{ + const std::string str = "1234"; + std::istringstream in(str); + char buf[6]; + in.width(5); + in >> buf; // stops after reading 4 chars, doesn't reach EOF + VERIFY( !in.eof() ); + VERIFY( buf == str ); +} + +struct CT : std::char_traits { }; + +void +test02() +{ + const std::string str = "1234"; + std::basic_istringstream in(str.c_str()); + char buf[6]; + in.width(5); + in >> buf; // stops after reading 4 chars, doesn't reach EOF + VERIFY( !in.eof() ); + VERIFY( buf == str ); +} + +int +main() +{ + test01(); + test02(); +} diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/wchar_t/5.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/wchar_t/5.cc new file mode 100644 index 00000000000..03bbcadfda5 --- /dev/null +++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/wchar_t/5.cc @@ -0,0 +1,54 @@ +// Copyright (C) 2020 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This 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 General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +// { dg-do run } + +#include +#include + +void +test01() +{ + const std::string str = "1234"; + std::istringstream in(str); + char buf[6]; + in.width(5); + in >> buf; // stops after reading 4 chars, doesn't reach EOF + VERIFY( !in.eof() ); + VERIFY( buf == str ); +} + +struct WT : std::char_traits { }; + +void +test02() +{ + const std::wstring str = L"1234"; + std::basic_istringstream in(str.c_str()); + wchar_t buf[6]; + in.width(5); + in >> buf; // stops after reading 4 chars, doesn't reach EOF + VERIFY( !in.eof() ); + VERIFY( buf == str ); +} + +int +main() +{ + test01(); + test02(); +}