Changeset 552da22 for lib/xmltree.c

Timestamp:

2023-04-01T20:29:42Z (13 months ago)

Author:

GitHub <noreply@…>

Branches:

master

Children:

10425b2

Parents:

a4ac9c4

git-author:

David Cantrell <dcantrell@…> (01-04-23 20:29:42)

git-committer:

GitHub <noreply@…> (01-04-23 20:29:42)

Message:

Use g_memdup2() with glib versions >= 2.68.0 (#168)

• Use g_memdup2() with glib versions >= 2.68.0

g_memdup() was deprecated in glib 2.68.0. The new function is
g_memdup2(). Still support building with older versions of glib via
macros.

Signed-off-by: David Cantrell <dcantrell@…>

• Fall back to g_memdup when g_memdup2 is not available, rather than defining custom macro

---

Signed-off-by: David Cantrell <dcantrell@…>
Co-authored-by: Jelmer Vernooij <jelmer@…>

File:

• lib/xmltree.c (modified) (2 diffs)

lib/xmltree.c

@@ -33 +33 @@
 #define g_strncasecmp g_ascii_strncasecmp
 
+/* g_memdup() deprecated as of glib 2.68.0 */
+#ifdef GLIB_VERSION_2_68
+#define g_memdup2 g_memdup2
+#else
+#define g_memdup2 g_memdup
+#endif
+
 static void xt_start_element(GMarkupParseContext *ctx, const gchar *element_name, const gchar **attr_names,
                              const gchar **attr_values, gpointer data, GError **error)
@@ -364 +371 @@
         dup->flags = node->flags;
         if (node->text) {
-                dup->text = g_memdup(node->text, node->text_len + 1);
+                dup->text = g_memdup2(node->text, node->text_len + 1);
                 dup->text_len = node->text_len;
         }