mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-02-07 22:20:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

re PR libstdc++/21172 (potential integer overflow error in STL heap functions)

Browse Source 
2007-02-12  Paolo Carlini  <pcarlini@suse.de>

	PR libstdc++/21172
	* include/bits/stl_heap.h (__adjust_heap(_RandomAccessIterator,
	_Distance, _Distance, _Tp), __adjust_heap(_RandomAccessIterator,
	_Distance, _Distance, _Tp, _Compare)): Avoid potential integer
	overflow.

	* include/bits/stl_heap.h (__is_heap(_RandomAccessIterator,
	_RandomAccessIterator), __is_heap(_RandomAccessIterator,
	_RandomAccessIterator, _StrictWeakOrdering): Mark inline.
	(make_heap(_RandomAccessIterator, _RandomAccessIterator,
	_Compare)): Do not mark inline.

	* include/bits/stl_heap.h (push_heap(_RandomAccessIterator,
	_RandomAccessIterator), sort_heap(_RandomAccessIterator,
	_RandomAccessIterator)): Uncomment __glibcxx_requires_heap.

From-SVN: r121875
This commit is contained in:
Paolo Carlini 2007-02-13 00:25:30 +00:00 committed by Paolo Carlini
parent 51d4712ed1
commit bad333ffe3
2 changed files with 39 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,21 @@
2007-02-12 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/21172
* include/bits/stl_heap.h (__adjust_heap(_RandomAccessIterator,
_Distance, _Distance, _Tp), __adjust_heap(_RandomAccessIterator,
_Distance, _Distance, _Tp, _Compare)): Avoid potential integer
overflow.
* include/bits/stl_heap.h (__is_heap(_RandomAccessIterator,
_RandomAccessIterator), __is_heap(_RandomAccessIterator,
_RandomAccessIterator, _StrictWeakOrdering): Mark inline.
(make_heap(_RandomAccessIterator, _RandomAccessIterator,
_Compare)): Do not mark inline.
* include/bits/stl_heap.h (push_heap(_RandomAccessIterator,
_RandomAccessIterator), sort_heap(_RandomAccessIterator,
_RandomAccessIterator)): Uncomment __glibcxx_requires_heap.
2007-02-09 Richard Sandiford <richard@codesourcery.com> 2007-02-09 Richard Sandiford <richard@codesourcery.com>
* testsuite/22_locale/time_put/put/wchar_t/1.cc: XFAIL if * testsuite/22_locale/time_put/put/wchar_t/1.cc: XFAIL if

38
libstdc++-v3/include/bits/stl_heap.h
View File

@ -1,6 +1,7 @@
// Heap implementation -*- C++ -*- // Heap implementation -*- C++ -*-
// Copyright (C) 2001, 2004, 2005, 2006 Free Software Foundation, Inc. // Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
// Free Software Foundation, Inc.
// //
// This file is part of the GNU ISO C++ Library. This library is free // 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 // software; you can redistribute it and/or modify it under the
@ -100,14 +101,14 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
} }
template<typename _RandomAccessIterator> template<typename _RandomAccessIterator>
bool inline bool
__is_heap(_RandomAccessIterator __first, _RandomAccessIterator __last) __is_heap(_RandomAccessIterator __first, _RandomAccessIterator __last)
{ return std::__is_heap(__first, std::distance(__first, __last)); } { return std::__is_heap(__first, std::distance(__first, __last)); }
template<typename _RandomAccessIterator, typename _StrictWeakOrdering> template<typename _RandomAccessIterator, typename _StrictWeakOrdering>
bool inline bool
__is_heap(_RandomAccessIterator __first, _RandomAccessIterator __last, __is_heap(_RandomAccessIterator __first, _RandomAccessIterator __last,
_StrictWeakOrdering __comp) _StrictWeakOrdering __comp)
{ return std::__is_heap(__first, __comp, std::distance(__first, __last)); } { return std::__is_heap(__first, __comp, std::distance(__first, __last)); }
// Heap-manipulation functions: push_heap, pop_heap, make_heap, sort_heap. // Heap-manipulation functions: push_heap, pop_heap, make_heap, sort_heap.
@ -150,7 +151,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
_RandomAccessIterator>) _RandomAccessIterator>)
__glibcxx_function_requires(_LessThanComparableConcept<_ValueType>) __glibcxx_function_requires(_LessThanComparableConcept<_ValueType>)
__glibcxx_requires_valid_range(__first, __last); __glibcxx_requires_valid_range(__first, __last);
// __glibcxx_requires_heap(__first, __last - 1); __glibcxx_requires_heap(__first, __last - 1);
std::__push_heap(__first, _DistanceType((__last - __first) - 1), std::__push_heap(__first, _DistanceType((__last - __first) - 1),
_DistanceType(0), _ValueType(*(__last - 1))); _DistanceType(0), _ValueType(*(__last - 1)));
@ -210,17 +211,18 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
_Distance __len, _Tp __value) _Distance __len, _Tp __value)
{ {
const _Distance __topIndex = __holeIndex; const _Distance __topIndex = __holeIndex;
_Distance __secondChild = 2 * __holeIndex + 2; _Distance __secondChild = __holeIndex;
while (__secondChild < __len) while (__secondChild < (__len - 1) / 2)
{ {
__secondChild = 2 * (__secondChild + 1);
if (*(__first + __secondChild) < *(__first + (__secondChild - 1))) if (*(__first + __secondChild) < *(__first + (__secondChild - 1)))
__secondChild--; __secondChild--;
*(__first + __holeIndex) = *(__first + __secondChild); *(__first + __holeIndex) = *(__first + __secondChild);
__holeIndex = __secondChild; __holeIndex = __secondChild;
__secondChild = 2 * (__secondChild + 1);
} }
if (__secondChild == __len) if ((__len & 1) == 0 && __secondChild == (__len - 2) / 2)
{ {
__secondChild = 2 * (__secondChild + 1);
*(__first + __holeIndex) = *(__first + (__secondChild - 1)); *(__first + __holeIndex) = *(__first + (__secondChild - 1));
__holeIndex = __secondChild - 1; __holeIndex = __secondChild - 1;
} }
@ -273,18 +275,19 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
_Distance __len, _Tp __value, _Compare __comp) _Distance __len, _Tp __value, _Compare __comp)
{ {
const _Distance __topIndex = __holeIndex; const _Distance __topIndex = __holeIndex;
_Distance __secondChild = 2 * __holeIndex + 2; _Distance __secondChild = __holeIndex;
while (__secondChild < __len) while (__secondChild < (__len - 1) / 2)
{ {
__secondChild = 2 * (__secondChild + 1);
if (__comp(*(__first + __secondChild), if (__comp(*(__first + __secondChild),
*(__first + (__secondChild - 1)))) *(__first + (__secondChild - 1))))
__secondChild--; __secondChild--;
*(__first + __holeIndex) = *(__first + __secondChild); *(__first + __holeIndex) = *(__first + __secondChild);
__holeIndex = __secondChild; __holeIndex = __secondChild;
__secondChild = 2 * (__secondChild + 1);
} }
if (__secondChild == __len) if ((__len & 1) == 0 && __secondChild == (__len - 2) / 2)
{ {
__secondChild = 2 * (__secondChild + 1);
*(__first + __holeIndex) = *(__first + (__secondChild - 1)); *(__first + __holeIndex) = *(__first + (__secondChild - 1));
__holeIndex = __secondChild - 1; __holeIndex = __secondChild - 1;
} }
@ -319,14 +322,15 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
pop_heap(_RandomAccessIterator __first, pop_heap(_RandomAccessIterator __first,
_RandomAccessIterator __last, _Compare __comp) _RandomAccessIterator __last, _Compare __comp)
{ {
typedef typename iterator_traits<_RandomAccessIterator>::value_type
_ValueType;
// concept requirements // concept requirements
__glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept< __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
_RandomAccessIterator>) _RandomAccessIterator>)
__glibcxx_requires_valid_range(__first, __last); __glibcxx_requires_valid_range(__first, __last);
__glibcxx_requires_heap_pred(__first, __last, __comp); __glibcxx_requires_heap_pred(__first, __last, __comp);
typedef typename iterator_traits<_RandomAccessIterator>::value_type
_ValueType;
std::__pop_heap(__first, __last - 1, __last - 1, std::__pop_heap(__first, __last - 1, __last - 1,
_ValueType(*(__last - 1)), __comp); _ValueType(*(__last - 1)), __comp);
} }
@ -380,7 +384,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
* Comparisons are made using comp. * Comparisons are made using comp.
*/ */
template<typename _RandomAccessIterator, typename _Compare> template<typename _RandomAccessIterator, typename _Compare>
inline void void
make_heap(_RandomAccessIterator __first, _RandomAccessIterator __last, make_heap(_RandomAccessIterator __first, _RandomAccessIterator __last,
_Compare __comp) _Compare __comp)
{ {
@ -427,7 +431,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
__glibcxx_function_requires(_LessThanComparableConcept< __glibcxx_function_requires(_LessThanComparableConcept<
typename iterator_traits<_RandomAccessIterator>::value_type>) typename iterator_traits<_RandomAccessIterator>::value_type>)
__glibcxx_requires_valid_range(__first, __last); __glibcxx_requires_valid_range(__first, __last);
// __glibcxx_requires_heap(__first, __last); __glibcxx_requires_heap(__first, __last);
while (__last - __first > 1) while (__last - __first > 1)
std::pop_heap(__first, _RandomAccessIterator(__last--)); std::pop_heap(__first, _RandomAccessIterator(__last--));