aaru-dps/Aaru
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.git synced 2025-12-16 19:24:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix overflow on SecureDigital CSD v2.0 size calculation.

Browse Source
This commit is contained in:
Natalia Portillo
2018-08-05 01:09:43 +01:00
parent a7e8c43183
commit 3f0429586b
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DiscImageChef.Decoders/SecureDigital/CSD.cs
View File

@@ -359,7 +359,7 @@ namespace DiscImageChef.Decoders.SecureDigital
else else
{ {
sb.AppendFormat("\tDevice has {0} blocks", (csd.Size + 1) * 1024).AppendLine(); sb.AppendFormat("\tDevice has {0} blocks", (csd.Size + 1) * 1024).AppendLine();
result = (csd.Size + 1) * 1024 * 512; result = ((ulong)csd.Size + 1) * 1024 * 512;
if(result > 1099511627776) if(result > 1099511627776)
sb.AppendFormat("\tDevice has {0} TiB", result / 1099511627776.0).AppendLine(); sb.AppendFormat("\tDevice has {0} TiB", result / 1099511627776.0).AppendLine();
else if(result > 1073741824) else if(result > 1073741824)

1
DiscImageChef.Decoders/SecureDigital/VendorString.cs
View File

@@ -40,6 +40,7 @@ namespace DiscImageChef.Decoders.SecureDigital
{ {
case 0x02: return "Kingston"; case 0x02: return "Kingston";
case 0x03: return "Sandisk"; case 0x03: return "Sandisk";
case 0x27: return "CnMemory";
case 0xAA: return "QEMU"; case 0xAA: return "QEMU";
default: return $"Unknown manufacturer ID 0x{sdVendorId:X2}"; default: return $"Unknown manufacturer ID 0x{sdVendorId:X2}";
} }