Commit 45b77c57 authored by Wim Taymans's avatar Wim Taymans
Browse files

gst/udp/gstudpsrc.c: Handle the case where there are exactly 0 bytes to read...

gst/udp/gstudpsrc.c: Handle the case where there are exactly 0 bytes to read and the ioctl did not report an error. F...

Original commit message from CVS:
* gst/udp/gstudpsrc.c: (gst_udpsrc_create):
Handle the case where there are exactly 0 bytes to read and the ioctl
did not report an error. Fixes #433530.
parent 88bf47c9
2007-04-26 Wim Taymans <wim@fluendo.com>
* gst/udp/gstudpsrc.c: (gst_udpsrc_create):
Handle the case where there are exactly 0 bytes to read and the ioctl
did not report an error. Fixes #433530.
2007-04-26 Wim Taymans <wim@fluendo.com>
* gst/wavparse/gstwavparse.c: (gst_wavparse_perform_seek),
......
......@@ -451,13 +451,18 @@ gst_udpsrc_create (GstPushSrc * psrc, GstBuffer ** buf)
goto stopped;
} while (try_again);
/* ask how much is available for reading on the socket, this is exactly one
* UDP packet. */
/* ask how much is available for reading on the socket, this should be exactly
* one UDP packet. We will check the return value, though, because in some
* case it can return 0 and we don't want a 0 sized buffer. */
readsize = 0;
if ((ret = IOCTL_SOCKET (udpsrc->sock, FIONREAD, &readsize)) < 0)
goto ioctl_failed;
GST_LOG_OBJECT (udpsrc, "ioctl says %d bytes available", (int) readsize);
if (!readsize)
goto nothing_to_read;
pktdata = g_malloc (readsize);
pktsize = readsize;
......@@ -516,6 +521,13 @@ ioctl_failed:
("ioctl failed %d: %s (%d)", ret, g_strerror (errno), errno));
return GST_FLOW_ERROR;
}
nothing_to_read:
{
GST_ELEMENT_ERROR (udpsrc, RESOURCE, READ, (NULL),
("ioctl returned readsize 0 %d: %s (%d)", ret, g_strerror (errno),
errno));
return GST_FLOW_ERROR;
}
receive_error:
{
g_free (pktdata);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment