* grub-core/fs/zfs/zfs.c (nvlist_find_value): Fix return value.

diff --git a/ChangeLog b/ChangeLog
index f1ac4cdfdd744aa26b0223dc611c2d18cb538ac9..86f667f506a7bbf3a7db1a8a5b1f50ddfc3043f6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-05-03  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/fs/zfs/zfs.c (nvlist_find_value): Fix return value.
+
 2012-05-02  Vladimir Serbinenko  <phcoder@gmail.com>
 
        Fix reiserfs big seek times.

diff --git a/grub-core/fs/zfs/zfs.c b/grub-core/fs/zfs/zfs.c
index a3486ef9b428a8b7dee4a71fa110e80f95b6f4e6..ba0554abd761dac9b6cbf1a8cdbb6799e01f4568 100644 (file)
--- a/grub-core/fs/zfs/zfs.c
+++ b/grub-core/fs/zfs/zfs.c
@@ -3113,7 +3113,10 @@ nvlist_find_value (const char *nvlist_in, const char *name,
 
       nelm = grub_be_to_cpu32 (grub_get_unaligned32 (nvpair));
       if (nelm < 1)
-       return grub_error (GRUB_ERR_BAD_FS, "empty nvpair");
+       {
+         grub_error (GRUB_ERR_BAD_FS, "empty nvpair");
+         return 0;
+       }
 
       nvpair += 4;