mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-04 13:30:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

stream: handle against zero length payload

Browse source 
Don't send empty payloads in pinospay
This commit is contained in:
Wim Taymans 2016-04-07 11:38:00 +02:00
parent 2d392c7410
commit ccb93c9652
2 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pinos/client/stream.c
View file

@ -858,6 +858,7 @@ on_socket_condition (GSocket *socket,
} }
priv->buffer.size = need; priv->buffer.size = need;
if (hdr->length > 0) {
/* read data */ /* read data */
len = g_socket_receive (socket, len = g_socket_receive (socket,
(gchar *)priv->buffer.data + sizeof (PinosStackHeader), (gchar *)priv->buffer.data + sizeof (PinosStackHeader),
@ -865,6 +866,7 @@ on_socket_condition (GSocket *socket,
NULL, NULL,
&error); &error);
g_assert (len == hdr->length); g_assert (len == hdr->length);
}
/* handle control messages */ /* handle control messages */
for (i = 0; i < num_messages; i++) { for (i = 0; i < num_messages; i++) {

2
pinos/gst/gstpinospay.c
View file

@ -375,10 +375,12 @@ gst_pinos_pay_chain_pinos (GstPinosPay *pay, GstBuffer * buffer)
gst_buffer_unmap (buffer, &info); gst_buffer_unmap (buffer, &info);
pinos_buffer_clear (&pbuf); pinos_buffer_clear (&pbuf);
if (fdids->len > 0) {
gst_mini_object_set_qdata (GST_MINI_OBJECT_CAST (buffer), gst_mini_object_set_qdata (GST_MINI_OBJECT_CAST (buffer),
fdids_quark, fdids, NULL); fdids_quark, fdids, NULL);
gst_mini_object_weak_ref (GST_MINI_OBJECT_CAST (buffer), gst_mini_object_weak_ref (GST_MINI_OBJECT_CAST (buffer),
(GstMiniObjectNotify) release_fds, pay); (GstMiniObjectNotify) release_fds, pay);
}
return gst_pad_push (pay->srcpad, buffer); return gst_pad_push (pay->srcpad, buffer);
} }