mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-11 18:05:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

buffer: document that _extract_dup() will return NULL for 0-sized buf

Browse source 
And make it explicit, and don't call _extract() on NULL data buffer.
This commit is contained in:
Tim-Philipp Müller 2017-12-05 15:16:36 +00:00
parent 7d1dabe020
commit bcc5e5bcd5
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
gst/gstbuffer.c
View file

@ -2393,7 +2393,7 @@ gst_buffer_foreach_meta (GstBuffer * buffer, GstBufferForeachMetaFunc func,
* @offset: the offset to extract * @offset: the offset to extract
* @size: the size to extract * @size: the size to extract
* @dest: (array length=dest_size) (element-type guint8) (out): A pointer where * @dest: (array length=dest_size) (element-type guint8) (out): A pointer where
* the destination array will be written. * the destination array will be written. Might be %NULL if the size is 0.
* @dest_size: (out): A location where the size of @dest can be written * @dest_size: (out): A location where the size of @dest can be written
* *
* Extracts a copy of at most @size bytes the data at @offset into * Extracts a copy of at most @size bytes the data at @offset into
@ -2406,13 +2406,18 @@ void
gst_buffer_extract_dup (GstBuffer * buffer, gsize offset, gsize size, gst_buffer_extract_dup (GstBuffer * buffer, gsize offset, gsize size,
gpointer * dest, gsize * dest_size) gpointer * dest, gsize * dest_size)
{ {
gsize real_size; gsize real_size, alloc_size;
real_size = gst_buffer_get_size (buffer); real_size = gst_buffer_get_size (buffer);
*dest = g_malloc (MIN (real_size - offset, size)); alloc_size = MIN (real_size - offset, size);
if (alloc_size == 0) {
*dest_size = gst_buffer_extract (buffer, offset, *dest, size); *dest = NULL;
*dest_size = 0;
} else {
*dest = g_malloc (alloc_size);
*dest_size = gst_buffer_extract (buffer, offset, *dest, size);
}
} }
GST_DEBUG_CATEGORY_STATIC (gst_parent_buffer_meta_debug); GST_DEBUG_CATEGORY_STATIC (gst_parent_buffer_meta_debug);