summaryrefslogtreecommitdiffstats
path: root/media/libwebp/dec/idec_dec.c
diff options
context:
space:
mode:
authorJustOff <Off.Just.Off@gmail.com>2018-06-29 21:02:12 +0300
committerJustOff <Off.Just.Off@gmail.com>2018-06-29 21:02:12 +0300
commit56c9d0f6bf81511f14a7741a878305dbb3a2ea14 (patch)
treecb38da4843b5b85d32f2a6f8a5076ed5e223e55d /media/libwebp/dec/idec_dec.c
parent05e6fcc0247af89209010eae0a2acdb1d16f95a5 (diff)
downloadUXP-56c9d0f6bf81511f14a7741a878305dbb3a2ea14.tar
UXP-56c9d0f6bf81511f14a7741a878305dbb3a2ea14.tar.gz
UXP-56c9d0f6bf81511f14a7741a878305dbb3a2ea14.tar.lz
UXP-56c9d0f6bf81511f14a7741a878305dbb3a2ea14.tar.xz
UXP-56c9d0f6bf81511f14a7741a878305dbb3a2ea14.zip
Apply known security patches (webp:381,383,384) to libwebp-1.0.0
Diffstat (limited to 'media/libwebp/dec/idec_dec.c')
-rw-r--r--media/libwebp/dec/idec_dec.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/media/libwebp/dec/idec_dec.c b/media/libwebp/dec/idec_dec.c
index 6777323c7..c9506bc83 100644
--- a/media/libwebp/dec/idec_dec.c
+++ b/media/libwebp/dec/idec_dec.c
@@ -283,10 +283,8 @@ static void RestoreContext(const MBContext* context, VP8Decoder* const dec,
static VP8StatusCode IDecError(WebPIDecoder* const idec, VP8StatusCode error) {
if (idec->state_ == STATE_VP8_DATA) {
- VP8Io* const io = &idec->io_;
- if (io->teardown != NULL) {
- io->teardown(io);
- }
+ // Synchronize the thread, clean-up and check for errors.
+ VP8ExitCritical((VP8Decoder*)idec->dec_, &idec->io_);
}
idec->state_ = STATE_ERROR;
return error;