shithub: libvpx

Info  •  Files  •  Log  •  Branches

vp9_dthread: interleave mutex/cond alloc+init

this ensures both are properly initialized when calling _dealloc().
+ check the arrays before access

Change-Id: I789af39b41c271b5cb3c029526581b4d9903b895

--- a/vp9/decoder/vp9_dthread.c

+++ b/vp9/decoder/vp9_dthread.c

@@ -220,11 +220,13 @@

   CHECK_MEM_ERROR(cm, lf_sync->mutex_,

                   vpx_malloc(sizeof(*lf_sync->mutex_) * rows));

+  for (i = 0; i < rows; ++i) {

+    pthread_mutex_init(&lf_sync->mutex_[i], NULL);

+  }

+

   CHECK_MEM_ERROR(cm, lf_sync->cond_,

                   vpx_malloc(sizeof(*lf_sync->cond_) * rows));

-

   for (i = 0; i < rows; ++i) {

-    pthread_mutex_init(&lf_sync->mutex_[i], NULL);

     pthread_cond_init(&lf_sync->cond_[i], NULL);

   }

 #endif  // CONFIG_MULTITHREAD

@@ -242,18 +244,29 @@

   if (lf_sync != NULL) {

     int i;

-    for (i = 0; i < rows; ++i) {

-      pthread_mutex_destroy(&lf_sync->mutex_[i]);

-      pthread_cond_destroy(&lf_sync->cond_[i]);

+    if (lf_sync->mutex_ != NULL) {

+      for (i = 0; i < rows; ++i) {

+        pthread_mutex_destroy(&lf_sync->mutex_[i]);

+      }

+      vpx_free(lf_sync->mutex_);

     }

+    if (lf_sync->cond_ != NULL) {

+      for (i = 0; i < rows; ++i) {

+        pthread_cond_destroy(&lf_sync->cond_[i]);

+      }

+      vpx_free(lf_sync->cond_);

+    }

-    vpx_free(lf_sync->mutex_);

-    vpx_free(lf_sync->cond_);

     vpx_free(lf_sync->cur_sb_col);

+    // clear the structure as the source of this call may be a resize in which

+    // case this call will be followed by an _alloc() which may fail.

+    vpx_memset(lf_sync, 0, sizeof(*lf_sync));

   }

 #else

   (void)rows;

-  if (lf_sync != NULL)

+  if (lf_sync != NULL) {

     vpx_free(lf_sync->cur_sb_col);

+    vpx_memset(lf_sync, 0, sizeof(*lf_sync));

+  }

 #endif  // CONFIG_MULTITHREAD

 }