From 1c917b030e1f7076688278694fbab514cfb6d5e5 Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Fri, 30 Mar 2007 17:10:50 +0000 Subject: [PATCH] re PR libstdc++/31401 (string find behaves strange when searching from npos) 2007-03-30 Paolo Carlini PR libstdc++/31401 * include/bits/basic_string.tcc (find(const _CharT*, size_type, size_type)): Avoid unsigned overflow. * testsuite/21_strings/basic_string/find/char/4.cc: New. * testsuite/21_strings/basic_string/find/wchar_t/4.cc: Likewise. From-SVN: r123361 --- libstdc++-v3/ChangeLog | 8 ++++ libstdc++-v3/include/bits/basic_string.tcc | 2 +- .../21_strings/basic_string/find/char/4.cc | 43 +++++++++++++++++++ .../21_strings/basic_string/find/wchar_t/4.cc | 43 +++++++++++++++++++ 4 files changed, 95 insertions(+), 1 deletion(-) create mode 100644 libstdc++-v3/testsuite/21_strings/basic_string/find/char/4.cc create mode 100644 libstdc++-v3/testsuite/21_strings/basic_string/find/wchar_t/4.cc diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index a97306552e1..7483907ac0d 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,11 @@ +2007-03-30 Paolo Carlini + + PR libstdc++/31401 + * include/bits/basic_string.tcc (find(const _CharT*, size_type, + size_type)): Avoid unsigned overflow. + * testsuite/21_strings/basic_string/find/char/4.cc: New. + * testsuite/21_strings/basic_string/find/wchar_t/4.cc: Likewise. + 2007-03-27 Paolo Carlini * include/bits/fstream.tcc (basic_filebuf<>::underflow): diff --git a/libstdc++-v3/include/bits/basic_string.tcc b/libstdc++-v3/include/bits/basic_string.tcc index 3437fdaba4a..78428c1eff6 100644 --- a/libstdc++-v3/include/bits/basic_string.tcc +++ b/libstdc++-v3/include/bits/basic_string.tcc @@ -727,7 +727,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) if (__n <= __size) { - for (; __pos + __n <= __size; ++__pos) + for (; __pos <= __size - __n; ++__pos) if (traits_type::eq(__data[__pos], __s[0]) && traits_type::compare(__data + __pos + 1, __s + 1, __n - 1) == 0) diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/find/char/4.cc b/libstdc++-v3/testsuite/21_strings/basic_string/find/char/4.cc new file mode 100644 index 00000000000..7d6e8c01847 --- /dev/null +++ b/libstdc++-v3/testsuite/21_strings/basic_string/find/char/4.cc @@ -0,0 +1,43 @@ +// 2007-03-30 Paolo Carlini + +// Copyright (C) 2007 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 2, 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 COPYING. If not, write to the Free +// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +// USA. + +// 21.3.6.1 basic_string find + +#include +#include + +// libstdc++/31401 +void test01() +{ + bool test __attribute__((unused)) = true; + typedef std::string::size_type csize_type; + csize_type npos = std::string::npos; + + std::string use = "anu"; + csize_type pos1 = use.find("a", npos); + + VERIFY( pos1 == npos ); +} + +int main() +{ + test01(); + return 0; +} diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/find/wchar_t/4.cc b/libstdc++-v3/testsuite/21_strings/basic_string/find/wchar_t/4.cc new file mode 100644 index 00000000000..ea34d9925fe --- /dev/null +++ b/libstdc++-v3/testsuite/21_strings/basic_string/find/wchar_t/4.cc @@ -0,0 +1,43 @@ +// 2007-03-30 Paolo Carlini + +// Copyright (C) 2007 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 2, 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 COPYING. If not, write to the Free +// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +// USA. + +// 21.3.6.1 basic_string find + +#include +#include + +// libstdc++/31401 +void test01() +{ + bool test __attribute__((unused)) = true; + typedef std::wstring::size_type csize_type; + csize_type npos = std::wstring::npos; + + std::wstring use = L"anu"; + csize_type pos1 = use.find(L"a", npos); + + VERIFY( pos1 == npos ); +} + +int main() +{ + test01(); + return 0; +}