X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=extras%2Fcdrom_id%2Fcdrom_id.c;h=a1135665a9c1092db1788bfa4c0a0206406ce858;hb=9bbdf6eb3c0d84bf906176a51e4cda10882dadc6;hp=6d3326bd311851dfca1104fe68e346ba33f9d317;hpb=2c0644c1c2089763601f9f37d0be53711735612c;p=elogind.git

diff --git a/extras/cdrom_id/cdrom_id.c b/extras/cdrom_id/cdrom_id.c
index 6d3326bd3..a1135665a 100644
--- a/extras/cdrom_id/cdrom_id.c
+++ b/extras/cdrom_id/cdrom_id.c
@@ -470,9 +470,13 @@ static int cd_media_toc(int fd)
 	info("READ TOC: len: %d\n", len);
 	if (len > sizeof(toc))
 		return -1;
-	if (len < 8)
+	if (len < 2)
 		return -1;
 
+	/* empty media has no tracks */
+	if (len < 8)
+		return 0;
+
 	scsi_cmd_set(&sc, 0, 0x43);
 	scsi_cmd_set(&sc, 6, header[2]); /* First Track/Session Number */
 	scsi_cmd_set(&sc, 7, len >> 8);