From: Zeeshan Ali (Khattak) <zeeshanak@gnome.org>
Date: Mon, 11 Feb 2013 21:22:11 +0000 (+0200)
Subject: libblkid: Don't keep reading same sector of ISO
X-Git-Tag: v2.23-rc1~222
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fbafb98c505e915ddcb63fe365940f34a047faea;p=thirdparty%2Futil-linux.git

libblkid: Don't keep reading same sector of ISO

We were reading the same sector over and over again when parsing ISO9660.
This patches fixes it.
---

diff --git a/libblkid/src/superblocks/iso9660.c b/libblkid/src/superblocks/iso9660.c
index f7d2b760ab..33a8597ed6 100644
--- a/libblkid/src/superblocks/iso9660.c
+++ b/libblkid/src/superblocks/iso9660.c
@@ -167,8 +167,10 @@ static int probe_iso9660(blkid_probe pr, const struct blkid_idmag *mag)
 
 		if (iso == NULL || iso->vd_type == ISO_VD_END)
 			break;
-		if (iso->vd_type != ISO_VD_SUPPLEMENTARY)
+		if (iso->vd_type != ISO_VD_SUPPLEMENTARY) {
+			off += ISO_SECTOR_SIZE;
 			continue;
+      }
 
 		if (memcmp(iso->escape_sequences, "%/@", 3) == 0 ||
 		    memcmp(iso->escape_sequences, "%/C", 3) == 0 ||