mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-08-06 14:36:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #24438 from vrabaud:avif_check

Browse Source 
Check the return value of avifDecoderSetIOMemory.
This commit is contained in:
Alexander Smorkalov 2023-10-24 08:56:55 +03:00 committed by GitHub
commit 3429c27477
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
modules/imgcodecs/src/grfmt_avif.cpp
View File

@ -147,18 +147,6 @@ AvifDecoder::~AvifDecoder() {
size_t AvifDecoder::signatureLength() const { return kAvifSignatureSize; }
bool AvifDecoder::checkSignature(const String &signature) const {
avifDecoder *decoder = avifDecoderCreate();
if (!decoder) return false;
avifDecoderSetIOMemory(decoder,
reinterpret_cast<const uint8_t *>(signature.c_str()),
signature.size());
decoder->io->sizeHint = 1e9;
const avifResult status = avifDecoderParse(decoder);
avifDecoderDestroy(decoder);
return (status == AVIF_RESULT_OK || status == AVIF_RESULT_TRUNCATED_DATA);
}
#define OPENCV_AVIF_CHECK_STATUS(X, ENCDEC) \
{ \
const avifResult status = (X); \
@ -170,6 +158,20 @@ bool AvifDecoder::checkSignature(const String &signature) const {
} \
}
bool AvifDecoder::checkSignature(const String &signature) const {
avifDecoder *decoder = avifDecoderCreate();
if (!decoder) return false;
OPENCV_AVIF_CHECK_STATUS(
avifDecoderSetIOMemory(
decoder, reinterpret_cast<const uint8_t *>(signature.c_str()),
signature.size()),
decoder);
decoder->io->sizeHint = 1e9;
const avifResult status = avifDecoderParse(decoder);
avifDecoderDestroy(decoder);
return (status == AVIF_RESULT_OK || status == AVIF_RESULT_TRUNCATED_DATA);
}
ImageDecoder AvifDecoder::newDecoder() const { return makePtr<AvifDecoder>(); }
bool AvifDecoder::readHeader() {