dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2025-04-05 00:16:50 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge "WebPPictureHasTransparency: add missing pointer check" into main

Browse Source
This commit is contained in:
James Zern 2022-08-11 16:55:21 +00:00 committed by Gerrit Code Review
commit e17293095b
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/enc/picture_csp_enc.c
View File

@ -70,9 +70,12 @@ int WebPPictureHasTransparency(const WebPPicture* picture) {
if (picture == NULL) return 0; if (picture == NULL) return 0;
if (picture->use_argb) { if (picture->use_argb) {
const int alpha_offset = ALPHA_OFFSET; const int alpha_offset = ALPHA_OFFSET;
return CheckNonOpaque((const uint8_t*)picture->argb + alpha_offset, if (picture->argb != NULL) {
picture->width, picture->height, return CheckNonOpaque((const uint8_t*)picture->argb + alpha_offset,
4, picture->argb_stride * sizeof(*picture->argb)); picture->width, picture->height,
4, picture->argb_stride * sizeof(*picture->argb));
}
return 0;
} }
return CheckNonOpaque(picture->a, picture->width, picture->height, return CheckNonOpaque(picture->a, picture->width, picture->height,
1, picture->a_stride); 1, picture->a_stride);