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

Merge "AImageDecoder: Make create enforce int32_t dimensions"

Browse Source
This commit is contained in:
Leon Scroggins
2020-02-12 15:41:51 +00:00
committed by Android (Google) Code Review
parent 9ab79433f7 2e6bedf937
commit 69b9dcf528
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,6 +28,7 @@
#include <utils/Color.h>
#include <fcntl.h>
#include <limits>
#include <optional>
#include <sys/stat.h>
#include <sys/types.h>
@@ -70,6 +71,14 @@ static int createFromStream(std::unique_ptr<SkStreamRewindable> stream, AImageDe
return ResultToErrorCode(result);
}
// AImageDecoderHeaderInfo_getWidth/Height return an int32_t. Ensure that
// the conversion is safe.
const auto& info = androidCodec->getInfo();
if (info.width() > std::numeric_limits<int32_t>::max()
|| info.height() > std::numeric_limits<int32_t>::max()) {
return ANDROID_IMAGE_DECODER_INVALID_INPUT;
}
*outDecoder = reinterpret_cast<AImageDecoder*>(new ImageDecoder(std::move(androidCodec)));
return ANDROID_IMAGE_DECODER_SUCCESS;
}