From 813ad9c4dd5a779f12ad2abf710c6e75a3117ef0 Mon Sep 17 00:00:00 2001 From: Patrick Palka Date: Mon, 21 Sep 2020 20:48:23 -0400 Subject: [PATCH] libstdc++: Fix division by zero in std::sample This fixes a division by zero in the selection-sampling std::__sample overload when the input range is empty (and hence __unsampled_sz is 0). libstdc++-v3/ChangeLog: * include/bits/stl_algo.h (__sample): Exit early when the input range is empty. * testsuite/25_algorithms/sample/3.cc: New test. --- libstdc++-v3/include/bits/stl_algo.h | 3 ++ .../testsuite/25_algorithms/sample/3.cc | 50 +++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 libstdc++-v3/testsuite/25_algorithms/sample/3.cc diff --git a/libstdc++-v3/include/bits/stl_algo.h b/libstdc++-v3/include/bits/stl_algo.h index a0b96c61798..2478b5857c1 100644 --- a/libstdc++-v3/include/bits/stl_algo.h +++ b/libstdc++-v3/include/bits/stl_algo.h @@ -5775,6 +5775,9 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO using _Gen = remove_reference_t<_UniformRandomBitGenerator>; using __uc_type = common_type_t; + if (__first == __last) + return __out; + __distrib_type __d{}; _Size __unsampled_sz = std::distance(__first, __last); __n = std::min(__n, __unsampled_sz); diff --git a/libstdc++-v3/testsuite/25_algorithms/sample/3.cc b/libstdc++-v3/testsuite/25_algorithms/sample/3.cc new file mode 100644 index 00000000000..e89c40e27ee --- /dev/null +++ b/libstdc++-v3/testsuite/25_algorithms/sample/3.cc @@ -0,0 +1,50 @@ +// 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-options "-std=gnu++17" } +// { dg-do run { target c++17 } } +// { dg-require-cstdint "" } + +#include +#include +#include +#include + +std::mt19937 rng; + +using std::sample; +using __gnu_test::test_container; +using __gnu_test::output_iterator_wrapper; +using __gnu_test::forward_iterator_wrapper; + +void +test01() +{ + const int in = 0; + test_container pop(&in, &in); + int out; + test_container samp(&out, &out + 1); + + auto it = sample(pop.begin(), pop.end(), samp.begin(), 1, rng); + VERIFY( it.ptr == &out ); +} + +int +main() +{ + test01(); +} -- 2.30.2