mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-11 18:05:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

srtpenc: unlock object lock before posting error

Browse source 
Posting an error with the object lock will deadlock. Rework the code
a bit to make things more simple.
This commit is contained in:
Wim Taymans 2014-03-25 17:39:18 +01:00
parent e84b0d626c
commit 9adb1734cf
1 changed files with 12 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
ext/srtp/gstsrtpenc.c
View file

@ -334,26 +334,6 @@ max_cipher_key_size (GstSrtpEnc * filter)
return (rtp_size > rtcp_size) ? rtp_size : rtcp_size;
}
static gboolean
check_key_size (GstSrtpEnc * filter)
{
guint expected;
gboolean res;
expected = max_cipher_key_size (filter);
res = gst_buffer_get_size (filter->key) == expected;
if (!res) {
GST_ELEMENT_ERROR (filter, LIBRARY, SETTINGS,
("Master key size is wrong"),
("Expected master key of %d bytes, but received %" G_GSIZE_FORMAT
" bytes", expected, gst_buffer_get_size (filter->key)));
}
return res;
}
/* Create stream
*/
static gboolean
@ -373,6 +353,9 @@ check_new_stream_locked (GstSrtpEnc * filter, guint32 ssrc)
GST_OBJECT_LOCK (filter);
if (HAS_CRYPTO (filter)) {
guint expected;
gsize keysize;
if (filter->key == NULL) {
GST_OBJECT_UNLOCK (filter);
GST_ELEMENT_ERROR (filter, LIBRARY, SETTINGS,
@ -380,8 +363,16 @@ check_new_stream_locked (GstSrtpEnc * filter, guint32 ssrc)
("Cipher is not NULL, key must be set"));
return FALSE;
}
if (!check_key_size (filter)) {
expected = max_cipher_key_size (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
" bytes", expected, keysize));
return FALSE;
}
}