From 1a823c9ae986d2d45e6aa7867c4c8e3c200e0b5c Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Mon, 11 Mar 2019 13:46:05 +0000 Subject: [PATCH] PR libstdc++/89629 fix _Hash_bytes for lengths > INT_MAX PR libstdc++/89629 * libsupc++/hash_bytes.cc [__SIZEOF_SIZE_T__ == 8] (_Hash_bytes): Use correct type for len_aligned. * testsuite/20_util/hash/89629.cc: New test. From-SVN: r269584 --- libstdc++-v3/ChangeLog | 7 ++++ libstdc++-v3/libsupc++/hash_bytes.cc | 2 +- libstdc++-v3/testsuite/20_util/hash/89629.cc | 43 ++++++++++++++++++++ 3 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 libstdc++-v3/testsuite/20_util/hash/89629.cc diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index cee2c9d1d57..4d99b05f3ec 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2019-03-11 Jonathan Wakely + + PR libstdc++/89629 + * libsupc++/hash_bytes.cc [__SIZEOF_SIZE_T__ == 8] (_Hash_bytes): + Use correct type for len_aligned. + * testsuite/20_util/hash/89629.cc: New test. + 2019-03-11 Jakub Jelinek PR libstdc++/89641 diff --git a/libstdc++-v3/libsupc++/hash_bytes.cc b/libstdc++-v3/libsupc++/hash_bytes.cc index 3a555c73a52..bd12188e524 100644 --- a/libstdc++-v3/libsupc++/hash_bytes.cc +++ b/libstdc++-v3/libsupc++/hash_bytes.cc @@ -139,7 +139,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // Remove the bytes not divisible by the sizeof(size_t). This // allows the main loop to process the data as 64-bit integers. - const int len_aligned = len & ~0x7; + const size_t len_aligned = len & ~(size_t)0x7; const char* const end = buf + len_aligned; size_t hash = seed ^ (len * mul); for (const char* p = buf; p != end; p += 8) diff --git a/libstdc++-v3/testsuite/20_util/hash/89629.cc b/libstdc++-v3/testsuite/20_util/hash/89629.cc new file mode 100644 index 00000000000..fd8273087fc --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/hash/89629.cc @@ -0,0 +1,43 @@ +// Copyright (C) 2019 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 { target { lp64 || llp64 } } } +// { dg-require-effective-target c++11 } +// { dg-require-effective-target run_expensive_tests } + +#include +#include + +void +test01() +{ + const std::size_t big = std::size_t(1) << 31; + std::string s; + try { + s.resize(big, 'a'); + } catch (const std::bad_alloc&) { + return; // try to avoid a FAIL if memory allocation fails + } + // PR libstdc++/89629 + (void) std::hash{}(s); +} + +int +main() +{ + test01(); +} -- 2.30.2