From 6cdd627a10b0b714fae7f54c0e4f035ceb40dd65 Mon Sep 17 00:00:00 2001 From: Aleksander Morgado Date: Tue, 25 Sep 2012 22:02:46 +0200 Subject: fixup! libqmi-glib,utils: handle alignment issues when reading integers from the buffer --- libqmi-glib/qmi-utils.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libqmi-glib/qmi-utils.c b/libqmi-glib/qmi-utils.c index c46f9d7..c9f57bf 100644 --- a/libqmi-glib/qmi-utils.c +++ b/libqmi-glib/qmi-utils.c @@ -163,7 +163,7 @@ qmi_utils_read_gint32_from_buffer (guint8 **buffer, g_assert (*buffer_size >= 4); memcpy (&tmp, &((*buffer)[0]), sizeof (tmp)); - *out = GUINT32_FROM_LE (tmp); + *out = GINT32_FROM_LE (tmp); *buffer = &((*buffer)[4]); *buffer_size = (*buffer_size) - 4; @@ -182,7 +182,7 @@ qmi_utils_read_guint64_from_buffer (guint8 **buffer, g_assert (*buffer_size >= 8); memcpy (&tmp, &((*buffer)[0]), sizeof (tmp)); - *out = GUINT64_FROM_LE (*((guint64 *)&((*buffer)[0]))); + *out = GUINT64_FROM_LE (tmp); *buffer = &((*buffer)[8]); *buffer_size = (*buffer_size) - 8; @@ -201,7 +201,7 @@ qmi_utils_read_gint64_from_buffer (guint8 **buffer, g_assert (*buffer_size >= 8); memcpy (&tmp, &((*buffer)[0]), sizeof (tmp)); - *out = GUINT64_FROM_LE (tmp); + *out = GINT64_FROM_LE (tmp); *buffer = &((*buffer)[8]); *buffer_size = (*buffer_size) - 8; -- cgit v1.2.3