diff options
author | Jonathan Wakely <jwakely@redhat.com> | 2020-10-08 00:34:56 +0100 |
---|---|---|
committer | Jonathan Wakely <jwakely@redhat.com> | 2020-10-08 00:34:56 +0100 |
commit | 6ae17a3b6835b30102607d45ac89c7a668e2c8d4 (patch) | |
tree | 1ff8bb630a94695a5f2d4d56e617fcc6ea9369c8 | |
parent | 23f75da95f5e8e09e9fcbd5b0d2885e6c44739aa (diff) | |
download | gcc-6ae17a3b6835b30102607d45ac89c7a668e2c8d4.zip gcc-6ae17a3b6835b30102607d45ac89c7a668e2c8d4.tar.gz gcc-6ae17a3b6835b30102607d45ac89c7a668e2c8d4.tar.bz2 |
libstdc++: Fix divide by zero in default template argument
libstdc++-v3/ChangeLog:
* include/bits/random.h (__detail::_Mod): Avoid divide by zero.
* testsuite/26_numerics/random/linear_congruential_engine/operators/call.cc:
New test.
-rw-r--r-- | libstdc++-v3/include/bits/random.h | 2 | ||||
-rw-r--r-- | libstdc++-v3/testsuite/26_numerics/random/linear_congruential_engine/operators/call.cc | 27 |
2 files changed, 28 insertions, 1 deletions
diff --git a/libstdc++-v3/include/bits/random.h b/libstdc++-v3/include/bits/random.h index 4a6558c..920f3d9 100644 --- a/libstdc++-v3/include/bits/random.h +++ b/libstdc++-v3/include/bits/random.h @@ -109,7 +109,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template<typename _Tp, _Tp __m, _Tp __a, _Tp __c, bool __big_enough = (!(__m & (__m - 1)) || (_Tp(-1) - __c) / __a >= __m - 1), - bool __schrage_ok = __m % __a < __m / __a> + bool __schrage_ok = __a != 0 && __m % __a < __m / __a> struct _Mod { typedef typename _Select_uint_least_t<std::__lg(__a) diff --git a/libstdc++-v3/testsuite/26_numerics/random/linear_congruential_engine/operators/call.cc b/libstdc++-v3/testsuite/26_numerics/random/linear_congruential_engine/operators/call.cc new file mode 100644 index 0000000..d1fff6d --- /dev/null +++ b/libstdc++-v3/testsuite/26_numerics/random/linear_congruential_engine/operators/call.cc @@ -0,0 +1,27 @@ +// 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 +// <http://www.gnu.org/licenses/>. + +// { dg-do compile { target c++11 } } + +#include <random> + +unsigned +test01() +{ + std::linear_congruential_engine<unsigned, 0, 0, 0> l; + return l(); // this used to result in divide by zero +} |