1 files changed, 9 insertions, 1 deletions

diff --git a/lib/libstand/cd9660.c b/lib/libstand/cd9660.c
index 5d9b57b65ccc2..e71d36f973c2c 100644
--- a/lib/libstand/cd9660.c
+++ b/lib/libstand/cd9660.c
@@ -353,7 +353,15 @@ cd9660_open(const char *path, struct open_file *f)
 
 			dp = (struct iso_directory_record *)
 				((char *) dp + isonum_711(dp->length));
-			off += isonum_711(dp->length);
+
+			/* if the new block is zero length, its padding */
+			if (isonum_711(dp->length) == 0) {
+			    /* skip to next block, if any */
+			    off = boff * ISO_DEFAULT_BLOCK_SIZE;
+			    continue;
+			} else {
+			    off += isonum_711(dp->length);
+			}
 		}
 		if (off >= dsize) {
 			rc = ENOENT;