mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-11-28 07:44:52 +00:00
da63b36ca7
- Rebase to current master - Fix pmtimer calibration to not take forever to fail on kvm. Signed-off-by: Peter Jones <pjones@redhat.com>
27 lines
802 B
Diff
27 lines
802 B
Diff
From c42acc23ff91ea0170eab5f1e10499dcfc4e0c92 Mon Sep 17 00:00:00 2001
|
|
From: Vladimir Serbinenko <phcoder@gmail.com>
|
|
Date: Wed, 30 Aug 2017 15:56:19 +0200
|
|
Subject: [PATCH 076/225] xfs: Don't attempt to iterate over empty directory.
|
|
|
|
Reported by: Tuomas Tynkkynen
|
|
---
|
|
grub-core/fs/xfs.c | 3 +++
|
|
1 file changed, 3 insertions(+)
|
|
|
|
diff --git a/grub-core/fs/xfs.c b/grub-core/fs/xfs.c
|
|
index 9f66dd6e4..c6031bd3f 100644
|
|
--- a/grub-core/fs/xfs.c
|
|
+++ b/grub-core/fs/xfs.c
|
|
@@ -828,6 +828,9 @@ grub_xfs_iterate_dir (grub_fshelp_node_t dir,
|
|
entries = (grub_be_to_cpu32 (tail->leaf_count)
|
|
- grub_be_to_cpu32 (tail->leaf_stale));
|
|
|
|
+ if (!entries)
|
|
+ continue;
|
|
+
|
|
/* Iterate over all entries within this block. */
|
|
while ((char *)direntry < (char *)tail)
|
|
{
|
|
--
|
|
2.14.3
|
|
|