mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 16:08:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

uridownload: Handle no buffers before EOS as error instead of crashing

Browse source
This commit is contained in:
Sebastian Dröge 2014-03-07 16:22:10 +01:00
parent d2880dce68
commit 73b188cfb9
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gst-libs/gst/uridownloader/gstfragment.c
View file

@ -211,6 +211,8 @@ gst_fragment_get_buffer (GstFragment * fragment)
if (!fragment->completed) if (!fragment->completed)
return NULL; return NULL;
if (!fragment->priv->buffer)
return NULL;
gst_buffer_ref (fragment->priv->buffer); gst_buffer_ref (fragment->priv->buffer);
return fragment->priv->buffer; return fragment->priv->buffer;

8
gst-libs/gst/uridownloader/gsturidownloader.c
View file

@ -39,6 +39,7 @@ struct _GstUriDownloaderPrivate
GstPad *pad; GstPad *pad;
GTimeVal *timeout; GTimeVal *timeout;
GstFragment *download; GstFragment *download;
gboolean got_buffer;
GMutex download_lock; /* used to restrict to one download only */ GMutex download_lock; /* used to restrict to one download only */
GError *err; GError *err;
@ -258,6 +259,7 @@ gst_uri_downloader_chain (GstPad * pad, GstObject * parent, GstBuffer * buf)
GST_LOG_OBJECT (downloader, "The uri fetcher received a new buffer " GST_LOG_OBJECT (downloader, "The uri fetcher received a new buffer "
"of size %" G_GSIZE_FORMAT, gst_buffer_get_size (buf)); "of size %" G_GSIZE_FORMAT, gst_buffer_get_size (buf));
downloader->priv->got_buffer = TRUE;
if (!gst_fragment_add_buffer (downloader->priv->download, buf)) if (!gst_fragment_add_buffer (downloader->priv->download, buf))
GST_WARNING_OBJECT (downloader, "Could not add buffer to fragment"); GST_WARNING_OBJECT (downloader, "Could not add buffer to fragment");
GST_OBJECT_UNLOCK (downloader); GST_OBJECT_UNLOCK (downloader);
@ -420,6 +422,7 @@ gst_uri_downloader_fetch_uri_with_range (GstUriDownloader * downloader,
g_mutex_lock (&downloader->priv->download_lock); g_mutex_lock (&downloader->priv->download_lock);
downloader->priv->err = NULL; downloader->priv->err = NULL;
downloader->priv->got_buffer = FALSE;
GST_OBJECT_LOCK (downloader); GST_OBJECT_LOCK (downloader);
if (downloader->priv->cancelled) { if (downloader->priv->cancelled) {
@ -487,6 +490,11 @@ gst_uri_downloader_fetch_uri_with_range (GstUriDownloader * downloader,
download = downloader->priv->download; download = downloader->priv->download;
downloader->priv->download = NULL; downloader->priv->download = NULL;
if (!downloader->priv->got_buffer) {
g_object_unref (download);
download = NULL;
GST_ERROR_OBJECT (downloader, "Didn't retrieve a buffer before EOS");
}
if (download != NULL) if (download != NULL)
GST_INFO_OBJECT (downloader, "URI fetched successfully"); GST_INFO_OBJECT (downloader, "URI fetched successfully");