diff options
| author | Duncan Palmer <dpalmer@digisoft.tv> | 2014-02-04 12:52:25 +0100 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2014-02-04 17:25:58 +0100 |
| commit | 535eb03d7508c2915506998ad40681e3b84de2aa (patch) | |
| tree | b9a8df671a1c2549bd99fd08dea478ab6f7fe926 | |
| parent | 9e65718cf63ab6960749477c521908ae88d36163 (diff) | |
| download | gstreamer-plugins-bad-535eb03d7508c2915506998ad40681e3b84de2aa.tar.gz | |
uridownloader: Fix race condition between EOS handling and downloading a range
https://bugzilla.gnome.org/show_bug.cgi?id=723134
| -rw-r--r-- | gst-libs/gst/uridownloader/gsturidownloader.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gst-libs/gst/uridownloader/gsturidownloader.c b/gst-libs/gst/uridownloader/gsturidownloader.c index 3c6dbc9e2..afd4c3e3a 100644 --- a/gst-libs/gst/uridownloader/gsturidownloader.c +++ b/gst-libs/gst/uridownloader/gsturidownloader.c @@ -210,6 +210,7 @@ gst_uri_downloader_bus_handler (GstBus * bus, GST_DEBUG_OBJECT (downloader, "Stopping download"); g_object_unref (downloader->priv->download); downloader->priv->download = NULL; + downloader->priv->cancelled = TRUE; g_cond_signal (&downloader->priv->cond); } GST_OBJECT_UNLOCK (downloader); @@ -409,7 +410,8 @@ gst_uri_downloader_fetch_uri_with_range (GstUriDownloader * downloader, * - the download was canceled */ GST_DEBUG_OBJECT (downloader, "Waiting to fetch the URI %s", uri); - g_cond_wait (&downloader->priv->cond, GST_OBJECT_GET_LOCK (downloader)); + while (!downloader->priv->cancelled && !downloader->priv->download->completed) + g_cond_wait (&downloader->priv->cond, GST_OBJECT_GET_LOCK (downloader)); if (downloader->priv->cancelled) { if (downloader->priv->download) { |