AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

don't create out of range enums

Browse Source 
UBSAN freaks out.

Bug: oss-fuzz:19358
Change-Id: I7c5fc129042b8b30fb5f10fe56b97cf62877c9bf
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/259537
Commit-Queue: Mike Klein <mtklein@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Auto-Submit: Mike Klein <mtklein@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
This commit is contained in:
Mike Klein 2019-12-12 10:24:25 -05:00 committed by Skia Commit-Bot
parent a27d625ca6
commit 77d3694f40
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fuzz/Fuzz.h
View File

@ -13,6 +13,7 @@
#include "include/core/SkRegion.h"
#include "include/core/SkTypes.h"
#include "include/private/SkMalloc.h"
#include "include/private/SkTFitsIn.h"
#include "tools/Registry.h"
#include <limits>
@ -98,9 +99,14 @@ inline void Fuzz::next(Arg* first, Args... rest) {
template <typename T, typename Min, typename Max>
inline void Fuzz::nextRange(T* value, Min min, Max max) {
this->next(value);
if (*value < (T)min) { *value = (T)min; }
if (*value > (T)max) { *value = (T)max; }
// UBSAN worries if we make an enum with out of range values, even temporarily.
using Raw = typename sk_strip_enum<T>::type;
Raw raw;
this->next(&raw);
if (raw < (Raw)min) { raw = (Raw)min; }
if (raw > (Raw)max) { raw = (Raw)max; }
*value = (T)raw;
}
template <typename T>