* grub-core/fs/zfs/zfs.c (nvlist_next_nvpair): Fix improper cast.

diff --git a/ChangeLog b/ChangeLog
index e96c5b1eef8e2d1c7d1ac36116e0cf6cf180734e..902e66556f3230607564d1bc6844055be4506eb9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-07-14  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/fs/zfs/zfs.c (nvlist_next_nvpair): Fix improper cast.
+
 2013-07-14  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/fs/zfs/zfs_lz4.c: Remove restrict keyword.

diff --git a/grub-core/fs/zfs/zfs.c b/grub-core/fs/zfs/zfs.c
index c4cd9b270144e7d4838f2d2fea2adc83dbae417e..4130594a123634ce2d75a1d3c1199f62acbaf767 100644 (file)
--- a/grub-core/fs/zfs/zfs.c
+++ b/grub-core/fs/zfs/zfs.c
@@ -839,8 +839,8 @@ nvlist_next_nvpair(const char *nvl, const char *nvpair)
                }
        }
        /* 8 bytes of 0 marks the end of the list */
-       if (*(grub_uint64_t*)nvpair == 0)
-               return (NULL);
+       if (grub_get_unaligned64 (nvpair) == 0)
+               return NULL;
        /*consistency checks*/
        if (nvpair + 4 * 3 >= nvl + VDEV_PHYS_SIZE)
        {