Changeset 552da22 for protocols/twitter

Timestamp:

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

protocols/twitter

Files:

• twitter.c (modified) (1 diff)
• twitter_lib.c (modified) (2 diffs)

protocols/twitter/twitter.c

@@ -1117 +1117 @@
 
         /* And an identi.ca variant: */
-        ret = g_memdup(ret, sizeof(struct prpl));
+        ret = g_memdup2(ret, sizeof(struct prpl));
         ret->name = "identica";
         ret->options =  PRPL_OPT_NOOTR;

protocols/twitter/twitter_lib.c

@@ -647 +647 @@
                 }
         } else if (text_value && text_value->type == json_string) {
-                txs->text = g_memdup(text_value->u.string.ptr, text_value->u.string.length + 1);
+                txs->text = g_memdup2(text_value->u.string.ptr, text_value->u.string.length + 1);
                 strip_html(txs->text);
                 expand_entities(&txs->text, node, extended_node);
@@ -674 +674 @@
         JSON_O_FOREACH(node, k, v) {
                 if (strcmp("text", k) == 0 && v->type == json_string) {
-                        txs->text = g_memdup(v->u.string.ptr, v->u.string.length + 1);
+                        txs->text = g_memdup2(v->u.string.ptr, v->u.string.length + 1);
                         strip_html(txs->text);
                 } else if (strcmp("created_at", k) == 0 && v->type == json_string) {