git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

re PR libstdc++/66327 (-fsanitize=nonnull-attribute errors in stl_algobase.h) 

PR libstdc++/66327
	* include/bits/stl_algobase.h (__equal<true>::equal): Do not call
	memcmp with null pointers.
	(__lexicographical_compare<true>::__lc): Do not call memcmp for empty
	ranges.

From-SVN: r223865
This commit is contained in:
Jonathan Wakely 2015-05-29 14:28:54 +01:00 committed by Jonathan Wakely
parent ca382af0c8
commit 6759eddee4
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,11 @@
2015-05-29 Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/66327
* include/bits/stl_algobase.h (__equal<true>::equal): Do not call
memcmp with null pointers.
(__lexicographical_compare<true>::__lc): Do not call memcmp for empty
ranges.
2015-05-28 Jonathan Wakely <jwakely@redhat.com> 2015-05-28 Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/65352 PR libstdc++/65352

15
libstdc++-v3/include/bits/stl_algobase.h
View File

@ -812,6 +812,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
static bool static bool
equal(const _Tp* __first1, const _Tp* __last1, const _Tp* __first2) equal(const _Tp* __first1, const _Tp* __last1, const _Tp* __first2)
{ {
if (__first1 == 0 || __first2 == 0)
return __first1 == __last1;
return !__builtin_memcmp(__first1, __first2, sizeof(_Tp) return !__builtin_memcmp(__first1, __first2, sizeof(_Tp)
* (__last1 - __first1)); * (__last1 - __first1));
} }
@ -917,9 +920,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
{ {
const size_t __len1 = __last1 - __first1; const size_t __len1 = __last1 - __first1;
const size_t __len2 = __last2 - __first2; const size_t __len2 = __last2 - __first2;
const int __result = __builtin_memcmp(__first1, __first2, if (__len1 && __len2)
std::min(__len1, __len2)); {
return __result != 0 ? __result < 0 : __len1 < __len2; if (int __result = __builtin_memcmp(__first1, __first2,
std::min(__len1, __len2)))
{
return __result < 0;
}
}
return __len1 < __len2;
} }
}; };