Changeset 552da22 for lib

Timestamp:

2023-04-01T20:29:42Z (20 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@…>

Location:

lib

Files:

• http_client.c (modified) (3 diffs)
• json_util.c (modified) (2 diffs)
• xmltree.c (modified) (2 diffs)

lib/http_client.c

@@ -372 +372 @@
         if (chunk != req->cbuf) {
                 req->cblen = eos - chunk;
-                s = g_memdup(chunk, req->cblen + 1);
+                s = g_memdup2(chunk, req->cblen + 1);
                 g_free(req->cbuf);
                 req->cbuf = s;
@@ -462 +462 @@
         /* Separately allocated space for headers and body. */
         req->sblen = req->body_size = req->reply_headers + req->bytes_read - req->reply_body;
-        req->sbuf = req->reply_body = g_memdup(req->reply_body, req->body_size + 1);
+        req->sbuf = req->reply_body = g_memdup2(req->reply_body, req->body_size + 1);
         req->reply_headers = g_realloc(req->reply_headers, end1 - req->reply_headers + 1);
 
@@ -680 +680 @@
 
         if (req->reply_body - req->sbuf >= 512) {
-                char *new = g_memdup(req->reply_body, req->body_size + 1);
+                char *new = g_memdup2(req->reply_body, req->body_size + 1);
                 g_free(req->sbuf);
                 req->reply_body = req->sbuf = new;

lib/json_util.c

@@ -27 +27 @@
 
 #include "json_util.h"
+
+/* 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
 
 json_value *json_o_get(const json_value *obj, const json_char *name)
@@ -61 +68 @@
 
         if (ret && ret->type == json_string && ret->u.string.ptr) {
-                return g_memdup(ret->u.string.ptr, ret->u.string.length + 1);
+                return g_memdup2(ret->u.string.ptr, ret->u.string.length + 1);
         } else {
                 return NULL;

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;
         }