Selaa lähdekoodia

Fix Apple vendor mode page sending (#272)

Apparently there was a mistake between || and && that caused
Apple vendor page to be sent even when Apple quirks were disabled
and when it wouldn't fit the buffer.
Petteri Aimonen 2 vuotta sitten
vanhempi
sitoutus
0abf488eeb
1 muutettua tiedostoa jossa 2 lisäystä ja 4 poistoa
  1. 2 4
      lib/SCSI2SD/src/firmware/mode.c

+ 2 - 4
lib/SCSI2SD/src/firmware/mode.c

@@ -516,10 +516,8 @@ static void doModeSense(
 
 	idx += modeSenseCDCapabilitiesPage(pc, idx, pageCode, &pageFound);
 
-	if ((
-			(scsiDev.target->cfg->quirks == S2S_CFG_QUIRKS_APPLE) ||
-			(idx + sizeof(AppleVendorPage) <= allocLength)
-		) &&
+	if ((scsiDev.target->cfg->quirks == S2S_CFG_QUIRKS_APPLE) &&
+	    (idx + sizeof(AppleVendorPage) <= allocLength) &&
 		(pageCode == 0x30 || pageCode == 0x3F))
 	{
 		pageFound = 1;