From patchwork Mon Mar 31 18:46:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 335544 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 62A34140081 for ; Tue, 1 Apr 2014 05:46:59 +1100 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:cc:subject:message-id:references:mime-version :content-type:content-transfer-encoding:in-reply-to; q=dns; s= default; b=PaQY3kDRaLXAqVkJANjDskUJYLY67EHIX10N6GKT7nZtS06Z9dIbx pOLADXZsHwB5RWQ6NTFCFWTbKpuoRhkSZ8o4BT5jU6qHG/h29VyQfs+O/CdYkN6l gxjdYr35RqBakIXr+fRaFQ0hZ7WZfRfliJfGjtqcgwPDVl5aGl7Jlw= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:cc:subject:message-id:references:mime-version :content-type:content-transfer-encoding:in-reply-to; s=default; bh=dQE7GQpXEMZNgjVpLX7cAQJ58dg=; b=MEYBDhziopTicG+tH0ovAq/fKujI 2CmKZKcY4/QhcJBqOLGpTYFBXtkxH7Gw/WZuUutUkpOWnIEwG28pmzJwQYVXxZGO aGe/2qZzjVKHJSUUDeFR9FXmyvYpZezda7E5cLYd9t4sGBOmZ5LRc3Yw3CVqGfGj jc+h16UEPrrPZmg= Received: (qmail 28727 invoked by alias); 31 Mar 2014 18:46:52 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 28707 invoked by uid 89); 31 Mar 2014 18:46:51 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.2 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_HELO_PASS, SPF_PASS autolearn=ham version=3.3.2 X-Spam-User: qpsmtpd, 2 recipients X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 31 Mar 2014 18:46:49 +0000 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s2VIkj8Q017253 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 31 Mar 2014 14:46:46 -0400 Received: from localhost (vpn1-4-233.ams2.redhat.com [10.36.4.233]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s2VIkiMs029286; Mon, 31 Mar 2014 14:46:45 -0400 Date: Mon, 31 Mar 2014 19:46:44 +0100 From: Jonathan Wakely To: Lars Gullik =?iso-8859-1?Q?Bj=F8nnes?= Cc: gcc-patches , libstdc++@gcc.gnu.org Subject: Re: [PATCH] std::quoted is too eager to clear the string Message-ID: <20140331184644.GJ13192@redhat.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) On 21/02/14 01:00 +0100, Lars Gullik Bjønnes wrote: > > * include/std/iomanip (_Quoted_string operator>>): Do not clear > string if input is not quoted. > >Currently the string is cleared regardless of >how the string is handled. This patch just >moves the clearing down so that we do not clear >it if we are not going to quote the string >(i.e. let operator>> handle the clearing if needed) >and also not if we encounter any stream error. > >This has been reported as (bug 60270). > >I have no GCC paperwork in order, but I expect this change >to be simple enough to not require that. I'm committing this (Lars's patch and my testcase) now since it's a necessary fix for a new, experimental feature, so I don't see any point in releasing it broken then having to fix it in two branches. Tested x86_64-linux, committed to trunk. commit d5c77024ad042628249dc0c38c87a75f2cde5f36 Author: Jonathan Wakely Date: Mon Mar 31 19:27:33 2014 +0100 2014-03-31 Lars Gullik Bjønnes Jonathan Wakely PR libstdc++/60270 * include/std/iomanip (_Quoted_string operator>>): Do not clear string if input is not quoted. * testsuite/27_io/manipulators/standard/char/60270.cc: New. diff --git a/libstdc++-v3/include/std/iomanip b/libstdc++-v3/include/std/iomanip index b2c7b95..73822db 100644 --- a/libstdc++-v3/include/std/iomanip +++ b/libstdc++-v3/include/std/iomanip @@ -415,8 +415,6 @@ _GLIBCXX_END_NAMESPACE_VERSION const _Quoted_string&, _CharT>& __str) { - __str._M_string.clear(); - _CharT __c; __is >> __c; if (!__is.good()) @@ -427,6 +425,7 @@ _GLIBCXX_END_NAMESPACE_VERSION __is >> __str._M_string; return __is; } + __str._M_string.clear(); std::ios_base::fmtflags __flags = __is.flags(__is.flags() & ~std::ios_base::skipws); do diff --git a/libstdc++-v3/testsuite/27_io/manipulators/standard/char/60270.cc b/libstdc++-v3/testsuite/27_io/manipulators/standard/char/60270.cc new file mode 100644 index 0000000..b2b213b --- /dev/null +++ b/libstdc++-v3/testsuite/27_io/manipulators/standard/char/60270.cc @@ -0,0 +1,38 @@ +// { dg-do run } +// { dg-options "-std=gnu++14" } + +// Copyright (C) 2014 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 +// . + +// 27.7.6 - Quoted manipulators [quoted.manip] + +// libstdc++/60270 + +#include +#include +#include +#include + +int main() +{ + std::istringstream in; + std::string s = "xxx"; + in >> s; + VERIFY( !s.empty() ); + in >> std::quoted(s); + VERIFY( !s.empty() ); +}