Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "AImageDecoder: ensure that stride is pixel aligned"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-01-27 16:06:27 +00:00
committed by Android (Google) Code Review
parent 992ba2ddd3 d894c59881
commit a4a8be3748
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
native/graphics/jni/imagedecoder.cpp
View File

@@ -325,11 +325,9 @@ int AImageDecoder_decodeImage(AImageDecoder* decoder,
ImageDecoder* imageDecoder = toDecoder(decoder);
const int height = imageDecoder->getOutputInfo().height();
const size_t minStride = AImageDecoder_getMinimumStride(decoder);
// If this calculation were to overflow, it would have been caught in
// setTargetSize.
if (stride < minStride || size < stride * (height - 1) + minStride) {
SkImageInfo info = imageDecoder->getOutputInfo();
size_t minSize = info.computeByteSize(stride);
if (SkImageInfo::ByteSizeOverflowed(minSize) || size < minSize || !info.validRowBytes(stride)) {
return ANDROID_IMAGE_DECODER_BAD_PARAMETER;
}