diff options
author | Aleksander Morgado <aleksander@lanedo.com> | 2012-09-25 22:02:46 +0200 |
---|---|---|
committer | Aleksander Morgado <aleksander@lanedo.com> | 2012-09-25 22:02:46 +0200 |
commit | 6cdd627a10b0b714fae7f54c0e4f035ceb40dd65 (patch) | |
tree | 8e9754bf4328fd4246f51a21be7bc7ff08e6d073 | |
parent | d724dc0d2f03932df1aff336fd92fe8e4b62f728 (diff) |
fixup! libqmi-glib,utils: handle alignment issues when reading integers from the buffer
-rw-r--r-- | libqmi-glib/qmi-utils.c | 6 |
1 files 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; |