mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

memory: handle -1 size in unmap

Browse source 
handle -1 in unmap correctly when the offset is modified.
This commit is contained in:
Wim Taymans 2012-01-06 07:02:36 +01:00
parent e4a58ec71e
commit 960c580ae2
2 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gst/gstmemory.c
View file

@ -217,8 +217,12 @@ _default_mem_unmap (GstMemoryDefault * mem, gpointer data, gsize size)
g_return_val_if_fail ((guint8 *) data >= mem->data g_return_val_if_fail ((guint8 *) data >= mem->data
&& (guint8 *) data < mem->data + mem->maxsize, FALSE); && (guint8 *) data < mem->data + mem->maxsize, FALSE);
if (mem->data + mem->offset != data) if (mem->data + mem->offset != data) {
mem->offset = (guint8 *) data - mem->data; gsize newoffset = (guint8 *) data - mem->data;
if (size == -1)
size = mem->offset + mem->size - newoffset;
mem->offset = newoffset;
}
if (size != -1) { if (size != -1) {
g_return_val_if_fail (mem->offset + size <= mem->maxsize, FALSE); g_return_val_if_fail (mem->offset + size <= mem->maxsize, FALSE);

16
tests/check/gst/gstmemory.c
View file

@ -527,6 +527,22 @@ GST_START_TEST (test_map_resize)
fail_unless (offset == 0); fail_unless (offset == 0);
fail_unless (maxalloc >= 100); fail_unless (maxalloc >= 100);
data = gst_memory_map (mem, &size, &maxsize, GST_MAP_READ);
gst_memory_unmap (mem, (guint8 *) data + 1, -1);
size = gst_memory_get_sizes (mem, &offset, &maxalloc);
fail_unless (size == 99);
fail_unless (offset == 1);
fail_unless (maxalloc >= 100);
data = gst_memory_map (mem, &size, &maxsize, GST_MAP_READ);
gst_memory_unmap (mem, (guint8 *) data - 1, -1);
size = gst_memory_get_sizes (mem, &offset, &maxalloc);
fail_unless (size == 100);
fail_unless (offset == 0);
fail_unless (maxalloc >= 100);
gst_memory_unref (mem); gst_memory_unref (mem);
} }