mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-03 05:05:52 +00:00
Code Issues 1 Projects Releases Wiki Activity

gstpluginloader: Don't hang on short reads/writes

Browse source 
If read_one or write_one was called but the stream closed before it could
read/write a whole packet, read_one/write_one would hang indefinitely,
consuming 100% CPU. This commit fixes that by treating a short read/write
as an error.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2994>
This commit is contained in:
Martin Dørum 2022-08-31 14:23:59 +02:00 committed by Tim-Philipp Müller
parent 1ba67eab9e
commit 674bb309d8
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
subprojects/gstreamer/gst/gstpluginloader.c
View file

@ -810,6 +810,9 @@ write_one (GstPluginLoader * l)
continue;
/* Failed to write -> child died */
goto fail_and_cleanup;
} else if (G_UNLIKELY (res == 0)) {
/* FD closed -> child died */
goto fail_and_cleanup;
}
to_write -= res;
out += res;
@ -1074,6 +1077,9 @@ read_one (GstPluginLoader * l)
continue;
GST_LOG ("Failed reading packet header");
return FALSE;
} else if (G_UNLIKELY (res == 0)) {
GST_LOG ("Failed reading packet header: Unexpected EOF");
return FALSE;
}
to_read -= res;
in += res;
@ -1111,6 +1117,9 @@ read_one (GstPluginLoader * l)
continue;
GST_ERROR ("Packet payload read failed");
return FALSE;
} else if (G_UNLIKELY (res == 0)) {
GST_ERROR ("Packet payload read failed: Unexpected EOF");
return FALSE;
}
to_read -= res;
in += res;