diff options
author | Louis Dionne <ldionne@apple.com> | 2019-02-12 16:06:02 +0000 |
---|---|---|
committer | Louis Dionne <ldionne@apple.com> | 2019-02-12 16:06:02 +0000 |
commit | 7232a84e686a0d1bf834a845e4e59c5594ae8957 (patch) | |
tree | 195b6c40e1303e25ea40e4e2bc4829a081d7231a /libcxx/src/hash.cpp | |
parent | d694160e665eb3cefc93a07af8232aec0b7d2410 (diff) | |
download | bcm5719-llvm-7232a84e686a0d1bf834a845e4e59c5594ae8957.tar.gz bcm5719-llvm-7232a84e686a0d1bf834a845e4e59c5594ae8957.zip |
[libc++] Avoid UB in the no-exceptions mode in a few places
Summary:
A few places in the library seem to behave unexpectedly when the library
is compiled or used with exceptions disabled. For example, not throwing
an exception when a pointer is NULL can lead us to dereference the pointer
later on, which is UB. This patch fixes such occurences.
It's hard to tell whether there are other places where the no-exceptions
mode misbehaves like this, because the replacement for throwing an
exception does not always seem to be abort()ing, but at least this
patch will improve the situation somewhat.
See http://lists.llvm.org/pipermail/libcxx-dev/2019-January/000172.html
Reviewers: mclow.lists, EricWF
Subscribers: christof, jkorous, dexonsmith, libcxx-commits
Differential Revision: https://reviews.llvm.org/D57761
llvm-svn: 353850
Diffstat (limited to 'libcxx/src/hash.cpp')
-rw-r--r-- | libcxx/src/hash.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/libcxx/src/hash.cpp b/libcxx/src/hash.cpp index 1631b91acb1..89bb736c86c 100644 --- a/libcxx/src/hash.cpp +++ b/libcxx/src/hash.cpp @@ -153,12 +153,8 @@ inline _LIBCPP_INLINE_VISIBILITY typename enable_if<_Sz == 4, void>::type __check_for_overflow(size_t N) { -#ifndef _LIBCPP_NO_EXCEPTIONS if (N > 0xFFFFFFFB) - throw overflow_error("__next_prime overflow"); -#else - (void)N; -#endif + __throw_overflow_error("__next_prime overflow"); } template <size_t _Sz = sizeof(size_t)> @@ -166,12 +162,8 @@ inline _LIBCPP_INLINE_VISIBILITY typename enable_if<_Sz == 8, void>::type __check_for_overflow(size_t N) { -#ifndef _LIBCPP_NO_EXCEPTIONS if (N > 0xFFFFFFFFFFFFFFC5ull) - throw overflow_error("__next_prime overflow"); -#else - (void)N; -#endif + __throw_overflow_error("__next_prime overflow"); } size_t |