Replace calls to g_memdup() with g_memdup2()

g_memdup() is subject to an integer overflow on 64-bit machines if the
object being copied is larger than UINT_MAX bytes. I suspect none of
these objects can actually be that large in practice, but it's easier
to replace all the calls than it is to assess whether we need to
replace them.

A backport in libglnx is used on systems where GLib is older than 2.68.x.

Signed-off-by: Simon McVittie <smcv@collabora.com>

2 files changed, 3 insertions, 3 deletions

diff --git a/app/flatpak-builtins-build-commit-from.c b/app/flatpak-builtins-build-commit-from.c
index ef5601c3..5cfb83fb 100644
--- a/app/flatpak-builtins-build-commit-from.c
+++ b/app/flatpak-builtins-build-commit-from.c
@@ -129,7 +129,7 @@ static GVariant *
 new_bytearray (const guchar *data,
                gsize         len)
 {
-  gpointer data_copy = g_memdup (data, len);
+  gpointer data_copy = g_memdup2 (data, len);
   GVariant *ret = g_variant_new_from_data (G_VARIANT_TYPE ("ay"), data_copy,
                                            len, FALSE, g_free, data_copy);
 
diff --git a/app/flatpak-complete.c b/app/flatpak-complete.c
index 8d671046..fad0638d 100644
--- a/app/flatpak-complete.c
+++ b/app/flatpak-complete.c
@@ -555,8 +555,8 @@ parse_completion_line_to_argv (const char        *initial_completion_line,
 
   /* Make a shallow copy of argv, which will be our "working set" */
   completion->argc = completion->original_argc;
-  completion->argv = g_memdup (completion->original_argv,
-                               sizeof (gchar *) * (completion->original_argc + 1));
+  completion->argv = g_memdup2 (completion->original_argv,
+                                sizeof (gchar *) * (completion->original_argc + 1));
 
   return parse_result;
 }