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

Clamp really big recording bounds to safe ints

Browse Source 
Bug: skia:10997
Change-Id: Ic6da0cbe6dd68009d888bc3174de913852559de7
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/338598
Commit-Queue: Michael Ludwig <michaelludwig@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
This commit is contained in:
Michael Ludwig 2020-11-25 14:29:30 -05:00 committed by Skia Commit-Bot
parent a2c40206c6
commit f2efb80bc3
2 changed files with 38 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/core/SkRecorder.cpp
View File

@ -40,22 +40,41 @@ void SkDrawableList::append(SkDrawable* drawable) {
///////////////////////////////////////////////////////////////////////////////////////////////
static SkIRect safe_picture_bounds(const SkRect& bounds) {
SkIRect picBounds = bounds.roundOut();
// roundOut() saturates the float edges to +/-SK_MaxS32FitsInFloat (~2billion), but this is
// large enough that width/height calculations will overflow, leading to negative dimensions.
static constexpr int32_t kSafeEdge = SK_MaxS32FitsInFloat / 2 - 1;
static constexpr SkIRect kSafeBounds = {-kSafeEdge, -kSafeEdge, kSafeEdge, kSafeEdge};
static_assert((kSafeBounds.fRight - kSafeBounds.fLeft) >= 0 &&
(kSafeBounds.fBottom - kSafeBounds.fTop) >= 0);
if (!picBounds.intersect(kSafeBounds)) {
picBounds.setEmpty();
}
return picBounds;
}
SkRecorder::SkRecorder(SkRecord* record, int width, int height, SkMiniRecorder* mr)
: SkCanvasVirtualEnforcer<SkNoDrawCanvas>(width, height)
, fApproxBytesUsedBySubPictures(0)
, fRecord(record)
, fMiniRecorder(mr) {}
: SkCanvasVirtualEnforcer<SkNoDrawCanvas>(width, height)
, fApproxBytesUsedBySubPictures(0)
, fRecord(record)
, fMiniRecorder(mr) {
SkASSERT(this->imageInfo().width() >= 0 && this->imageInfo().height() >= 0);
}
SkRecorder::SkRecorder(SkRecord* record, const SkRect& bounds, SkMiniRecorder* mr)
: SkCanvasVirtualEnforcer<SkNoDrawCanvas>(bounds.roundOut())
, fApproxBytesUsedBySubPictures(0)
, fRecord(record)
, fMiniRecorder(mr) {}
: SkCanvasVirtualEnforcer<SkNoDrawCanvas>(safe_picture_bounds(bounds))
, fApproxBytesUsedBySubPictures(0)
, fRecord(record)
, fMiniRecorder(mr) {
SkASSERT(this->imageInfo().width() >= 0 && this->imageInfo().height() >= 0);
}
void SkRecorder::reset(SkRecord* record, const SkRect& bounds, SkMiniRecorder* mr) {
this->forgetRecord();
fRecord = record;
this->resetCanvas(bounds.roundOut());
this->resetCanvas(safe_picture_bounds(bounds));
SkASSERT(this->imageInfo().width() >= 0 && this->imageInfo().height() >= 0);
fMiniRecorder = mr;
}

10
tests/RecorderTest.cpp
View File

@ -108,3 +108,13 @@ DEF_TEST(Recorder_drawImage_takeReference, reporter) {
}
REPORTER_ASSERT(reporter, image->unique());
}
// skbug.com/10997
DEF_TEST(Recorder_boundsOverflow, reporter) {
SkRect bigBounds = {SK_ScalarMin, SK_ScalarMin, SK_ScalarMax, SK_ScalarMax};
SkRecord record;
SkRecorder recorder(&record, bigBounds);
REPORTER_ASSERT(reporter, recorder.imageInfo().width() > 0 &&
recorder.imageInfo().height() > 0);
}