Resolve deadlock in resetStream (#104)

awslabs · Dec 31, 2020 · 0c255bb · 0c255bb
1 parent c020b49
commit 0c255bb
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/src/client/src/Stream.c b/src/client/src/Stream.c
@@ -3206,6 +3206,7 @@ STATUS resetStream(PKinesisVideoStream pKinesisVideoStream)
 {
     ENTERS();
     STATUS retStatus = STATUS_SUCCESS;
+    BOOL streamLocked = FALSE;
 
     PKinesisVideoClient pKinesisVideoClient = NULL;
 
@@ -3221,6 +3222,7 @@ STATUS resetStream(PKinesisVideoStream pKinesisVideoStream)
 
     // Lock the stream
     pKinesisVideoClient->clientCallbacks.lockMutexFn(pKinesisVideoClient->clientCallbacks.customData, pKinesisVideoStream->base.lock);
+    streamLocked = TRUE;
 
     // Reset the current view item
     MEMSET(&pKinesisVideoStream->curViewItem, 0x00, SIZEOF(CurrentViewItem));
@@ -3324,8 +3326,14 @@ STATUS resetStream(PKinesisVideoStream pKinesisVideoStream)
 
     // Unlock the stream
     pKinesisVideoClient->clientCallbacks.unlockMutexFn(pKinesisVideoClient->clientCallbacks.customData, pKinesisVideoStream->base.lock);
+    streamLocked = FALSE;
 
 CleanUp:
+
+    if (streamLocked) {
+        pKinesisVideoClient->clientCallbacks.unlockMutexFn(pKinesisVideoClient->clientCallbacks.customData, pKinesisVideoStream->base.lock);
+    }
+
     LEAVES();
     return retStatus;
 }