mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-18 22:36:33 +00:00
Code Issues 1 Projects Releases Wiki Activity

glmemory: Use g_try_malloc() in the appropriate places

Browse source 
g_malloc() aborts if allocation fails, it's pointless to check against NULL
afterwards. That's why g_try_malloc() exists.
This commit is contained in:
Sebastian Dröge 2014-11-27 18:04:58 +01:00 committed by Tim-Philipp Müller
parent 45db2931c8
commit 47a8242399
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gst-libs/gst/gl/gstglmemory.c
View file

@ -852,7 +852,12 @@ _gl_mem_copy (GstGLMemory * src, gssize offset, gssize size)
if (GST_GL_MEMORY_FLAG_IS_SET (src, GST_GL_MEMORY_FLAG_NEED_UPLOAD)) { if (GST_GL_MEMORY_FLAG_IS_SET (src, GST_GL_MEMORY_FLAG_NEED_UPLOAD)) {
dest = _gl_mem_new (src->mem.allocator, NULL, src->context, &src->info, dest = _gl_mem_new (src->mem.allocator, NULL, src->context, &src->info,
src->plane, NULL, NULL); src->plane, NULL, NULL);
dest->data = g_malloc (src->mem.maxsize); dest->data = g_try_malloc (src->mem.maxsize);
if (dest->data == NULL) {
GST_CAT_WARNING (GST_CAT_GL_MEMORY, "Could not copy GL Memory");
gst_memory_unref ((GstMemory *) dest);
return NULL;
}
memcpy (dest->data, src->data, src->mem.maxsize); memcpy (dest->data, src->data, src->mem.maxsize);
GST_GL_MEMORY_FLAG_SET (dest, GST_GL_MEMORY_FLAG_NEED_UPLOAD); GST_GL_MEMORY_FLAG_SET (dest, GST_GL_MEMORY_FLAG_NEED_UPLOAD);
} else { } else {
@ -879,7 +884,7 @@ _gl_mem_copy (GstGLMemory * src, gssize offset, gssize size)
} }
dest->tex_id = copy_params.tex_id; dest->tex_id = copy_params.tex_id;
dest->data = g_malloc (src->mem.maxsize); dest->data = g_try_malloc (src->mem.maxsize);
if (dest->data == NULL) { if (dest->data == NULL) {
GST_CAT_WARNING (GST_CAT_GL_MEMORY, "Could not copy GL Memory"); GST_CAT_WARNING (GST_CAT_GL_MEMORY, "Could not copy GL Memory");
gst_memory_unref ((GstMemory *) dest); gst_memory_unref ((GstMemory *) dest);
@ -1005,7 +1010,7 @@ gst_gl_memory_wrapped_texture (GstGLContext * context, guint texture_id,
mem->tex_id = texture_id; mem->tex_id = texture_id;
mem->texture_wrapped = TRUE; mem->texture_wrapped = TRUE;
mem->data = g_malloc (mem->mem.maxsize); mem->data = g_try_malloc (mem->mem.maxsize);
if (mem->data == NULL) { if (mem->data == NULL) {
gst_memory_unref ((GstMemory *) mem); gst_memory_unref ((GstMemory *) mem);
return NULL; return NULL;
@ -1031,7 +1036,7 @@ gst_gl_memory_alloc (GstGLContext * context, GstVideoInfo * info, guint plane)
mem = _gl_mem_new (_gl_allocator, NULL, context, info, plane, NULL, NULL); mem = _gl_mem_new (_gl_allocator, NULL, context, info, plane, NULL, NULL);
mem->data = g_malloc (mem->mem.maxsize); mem->data = g_try_malloc (mem->mem.maxsize);
if (mem->data == NULL) { if (mem->data == NULL) {
gst_memory_unref ((GstMemory *) mem); gst_memory_unref ((GstMemory *) mem);
return NULL; return NULL;