From: Miguel París Díaz <mparisdiaz@gmail.com>
Date: Wed, 13 May 2015 11:14:14 +0000 (+0200)
Subject: srtpenc: fix over unlocking
X-Git-Tag: 1.19.3~507^2~8786
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=481e1f76e84e272fee49c9c8ee8d1af28f916c00;p=platform%2Fupstream%2Fgstreamer.git

srtpenc: fix over unlocking

Called should call function with lock, and is
also responsible for unlocking it later.

https://bugzilla.gnome.org/show_bug.cgi?id=749304
---

diff --git a/ext/srtp/gstsrtpenc.c b/ext/srtp/gstsrtpenc.c
index bf1b811..f5e3f13 100644
--- a/ext/srtp/gstsrtpenc.c
+++ b/ext/srtp/gstsrtpenc.c
@@ -425,7 +425,6 @@ gst_srtp_enc_create_session (GstSrtpEnc * filter)
     gsize keysize;
 
     if (filter->key == NULL) {
-      GST_OBJECT_UNLOCK (filter);
       GST_ELEMENT_ERROR (filter, LIBRARY, SETTINGS,
           ("Cipher is not NULL, key must be set"),
           ("Cipher is not NULL, key must be set"));
@@ -436,7 +435,6 @@ gst_srtp_enc_create_session (GstSrtpEnc * filter)
     keysize = gst_buffer_get_size (filter->key);
 
     if (expected != keysize) {
-      GST_OBJECT_UNLOCK (filter);
       GST_ELEMENT_ERROR (filter, LIBRARY, SETTINGS,
           ("Master key size is wrong"),
           ("Expected master key of %d bytes, but received %" G_GSIZE_FORMAT