projects
/
platform
/
upstream
/
gstreamer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6adf3c2
)
srtpenc: fix over unlocking
author
Miguel París Díaz
<mparisdiaz@gmail.com>
Wed, 13 May 2015 11:14:14 +0000
(13:14 +0200)
committer
Tim-Philipp Müller
<tim@centricular.com>
Wed, 13 May 2015 11:29:21 +0000
(12:29 +0100)
Called should call function with lock, and is
also responsible for unlocking it later.
https://bugzilla.gnome.org/show_bug.cgi?id=749304
ext/srtp/gstsrtpenc.c
patch
|
blob
|
history
diff --git
a/ext/srtp/gstsrtpenc.c
b/ext/srtp/gstsrtpenc.c
index
bf1b811
..
f5e3f13
100644
(file)
--- 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