. 修正尝试挂载 cdrom 文件系统时,错误覆盖缓冲区 (issues chenall#119)

yaya2007 · Jul 31, 2016 · d6fd30b · d6fd30b
1 parent e9725fe
commit d6fd30b
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/stage2/fsys_iso9660.c b/stage2/fsys_iso9660.c
@@ -202,6 +202,9 @@ iso9660_mount (void)
 		}
 		emu_iso_sector_size_2048 = 1;
 		devread(16, 0, 0x800, (unsigned long long)(unsigned int)(char *)PRIMDESC, 0xedde0d90);
+		if ((PRIMDESC->type.l != ISO_VD_PRIMARY)
+				|| memcmp ((char *)(PRIMDESC->id), ISO_STANDARD_ID, 5))
+			return 0;
     size = idr->size.l;
 		extent = idr->extent.l;
     emu_iso_sector_size_2048 = 1;
@@ -211,15 +214,15 @@ iso9660_mount (void)
     idr = (struct iso_directory_record *)((char *)idr + idr->length.l);
     if ((iso_types & (1<<ISO_TYPE_RockRidge)) && (idr->length.l - idr->name_len.l - sizeof(struct iso_directory_record) + sizeof(idr->name)) > 1)
 			iso_type = ISO_TYPE_RockRidge; //iso9600_RockRidge
- 		if ((PRIMDESC->type.l == ISO_VD_PRIMARY)
-	  	&& ! memcmp ((char *)(PRIMDESC->id), ISO_STANDARD_ID, 5))
-		{
+// 		if ((PRIMDESC->type.l == ISO_VD_PRIMARY)
+//	  	&& ! memcmp ((char *)(PRIMDESC->id), ISO_STANDARD_ID, 5))
+//		{
         ISO_SUPER->vol_sector = 16;
 	  	INODE->file_start = 0;
 	  	fsmax = PRIMDESC->volume_space_size.l;
 			return 1;
-		}
-		return 0;
+//		}
+//		return 0;
 	}
 }