Fix memleak in WebPIDelete (change#Id4faef1b).android-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-cts-4.4_r4android-cts-4.4_r1android-4.4w_r1android-4.4_r1.2.0.1android-4.4_r1.2android-4.4_r1.1.0.1android-4.4_r1.1android-4.4_r1.0.1android-4.4_r1android-4.4_r0.9android-4.4.4_r2.0.1android-4.4.4_r2android-4.4.4_r1.0.1android-4.4.4_r1android-4.4.3_r1.1.0.1android-4.4.3_r1.1android-4.4.3_r1.0.1android-4.4.3_r1android-4.4.2_r2.0.1android-4.4.2_r2android-4.4.2_r1.0.1android-4.4.2_r1android-4.4.1_r1.0.1android-4.4.1_r1kitkat-wearkitkat-releasekitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-devkitkat-cts-releasekitkat-cts-devidea133

Corresponding bug for this fix is b/10823924

Happens when decoding is partial (past Partition0), without error and
interrupted by calling WebPIDelete()
WebPIDelete() needs to call VP8ExitCritical() to free in-flight
resources.

The upstream change for WebP has landed WebP git via gerrit patch:
https://gerrit.chromium.org/gerrit/#/c/67199/


Change-Id: Iae0fb5d1bd239f9641503f08ffb79780da7aa42f

1 files changed, 4 insertions, 0 deletions

diff --git a/src/dec/idec.c b/src/dec/idec.c
index 5fbf49aa..61635ec9 100644
--- a/src/dec/idec.c
+++ b/src/dec/idec.c
@@ -606,6 +606,10 @@ void WebPIDelete(WebPIDecoder* idec) {
   if (idec == NULL) return;
   if (idec->dec_ != NULL) {
     if (!idec->is_lossless_) {
+      if (idec->state_ == STATE_VP8_DATA) {
+        // Synchronize the thread, clean-up and check for errors.
+        VP8ExitCritical(idec->dec_, &idec->io_);
+      }
       VP8Delete(idec->dec_);
     } else {
       VP8LDelete(idec->dec_);