From 26143333899382035e66f0360019c67d4a252e78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Sat, 22 May 2021 18:54:49 +0100 Subject: [PATCH] Use g_memdup2() where available and add fallback for older GLib versions Alloc size is based on existing allocations and struct sizes. g_memdup() is deprecated since GLib 2.68 and we want to avoid deprecation warnings with recent versions of GLib. Part-of: --- gst-libs/gst/vaapi/gstvaapifilter.c | 2 +- meson.build | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/gst-libs/gst/vaapi/gstvaapifilter.c b/gst-libs/gst/vaapi/gstvaapifilter.c index e0b3cd5fad..675c481b3f 100644 --- a/gst-libs/gst/vaapi/gstvaapifilter.c +++ b/gst-libs/gst/vaapi/gstvaapifilter.c @@ -671,7 +671,7 @@ op_data_ensure_caps (GstVaapiFilterOpData * op_data, gpointer filter_caps, return FALSE; } - op_data->va_caps = g_memdup (filter_cap, op_data->va_cap_size * va_num_caps); + op_data->va_caps = g_memdup2 (filter_cap, op_data->va_cap_size * va_num_caps); if (!op_data->va_caps) return FALSE; diff --git a/meson.build b/meson.build index 5c4a8dfa65..85ca246954 100644 --- a/meson.build +++ b/meson.build @@ -208,6 +208,10 @@ if gst_version_nano == 0 endif endif +if gmodule_dep.version().version_compare('< 2.67.4') + cdata.set('g_memdup2(ptr,sz)', '(G_LIKELY(((guint64)(sz)) < G_MAXUINT)) ? g_memdup(ptr,sz) : (g_abort(),NULL)') +endif + configure_file(output: 'config.h', configuration: cdata) python3 = import('python').find_installation()