diff options
| author | Daniel Kolesa <dkolesa@igalia.com> | 2021-06-02 16:12:36 +0200 |
|---|---|---|
| committer | Philip Withnall <pwithnall@endlessos.org> | 2021-06-07 16:18:29 +0100 |
| commit | f0ef089eaa517b57f0f34731707b6d4639a9cdb6 (patch) | |
| tree | d7a2b7d10fa82435bc9d45185e7f18fd123bb062 | |
| parent | ef8722baa444958601bfddfee3a977ccf4f7c02c (diff) | |
| download | libgdata-f0ef089eaa517b57f0f34731707b6d4639a9cdb6.tar.gz | |
use g_memdup2 when possible
| -rw-r--r-- | gdata/gdata-types.c | 4 | ||||
| -rw-r--r-- | gdata/services/contacts/gdata-contacts-contact.c | 8 |
2 files changed, 12 insertions, 0 deletions
diff --git a/gdata/gdata-types.c b/gdata/gdata-types.c index fd367052..d0a49479 100644 --- a/gdata/gdata-types.c +++ b/gdata/gdata-types.c @@ -38,7 +38,11 @@ static gpointer gdata_color_copy (gpointer color) { +#if GLIB_CHECK_VERSION (2, 68, 0) + return g_memdup2 (color, sizeof (GDataColor)); +#else return g_memdup (color, sizeof (GDataColor)); +#endif } GType diff --git a/gdata/services/contacts/gdata-contacts-contact.c b/gdata/services/contacts/gdata-contacts-contact.c index eb4148d0..bf584d48 100644 --- a/gdata/services/contacts/gdata-contacts-contact.c +++ b/gdata/services/contacts/gdata-contacts-contact.c @@ -3168,7 +3168,11 @@ gdata_contacts_contact_get_photo (GDataContactsContact *self, GDataContactsServi if (content_type != NULL) *content_type = g_strdup (soup_message_headers_get_content_type (message->response_headers, NULL)); *length = message->response_body->length; +#if GLIB_CHECK_VERSION (2, 68, 0) + data = g_memdup2 (message->response_body->data, message->response_body->length); +#else data = g_memdup (message->response_body->data, message->response_body->length); +#endif /* Update the stored photo ETag */ g_free (self->priv->photo_etag); @@ -3446,7 +3450,11 @@ gdata_contacts_contact_set_photo_async (GDataContactsContact *self, GDataContact /* Prepare the data to be passed to the thread */ photo_data = g_slice_new (PhotoData); photo_data->service = g_object_ref (service); +#if GLIB_CHECK_VERSION (2, 68, 0) + photo_data->data = g_memdup2 (data, length); +#else photo_data->data = g_memdup (data, length); +#endif photo_data->length = length; photo_data->content_type = g_strdup (content_type); |