Corrected some variables preinitialization.

This commit is contained in:
2017-12-18 18:36:02 +00:00
parent 66808fa498
commit 276c8e0e69
3 changed files with 7 additions and 9 deletions

View File

@@ -328,7 +328,7 @@ void AtaReport(int fd, xmlTextWriterPtr xmlWriter)
xmlTextWriterWriteFormatElement(xmlWriter, BAD_CAST "UnformattedBPS", "%u",
le16toh(identify->UnformattedBPS));
uint64_t blocks;
uint64_t blocks = 0;
if(identify->Cylinders > 0 && identify->Heads > 0 && identify->SectorsPerTrack != 0)
{

View File

@@ -1208,11 +1208,11 @@ void MmcReport(int fd, xmlTextWriterPtr xmlWriter, unsigned char *cdromMode)
xmlTextWriterStartElement(xmlWriter, BAD_CAST "ModeSense6Data");
xmlTextWriterWriteBase64(xmlWriter, buffer, 0, *(buffer + 0) + 1);
xmlTextWriterEndElement(xmlWriter);
if(!decMode->decoded)
if(decMode == NULL || !decMode->decoded)
decMode = DecodeMode6(buffer, 0x05);
}
if(decMode->decoded)
if(decMode != NULL && decMode->decoded)
{
xmlTextWriterWriteFormatElement(xmlWriter, BAD_CAST "MediumType", "%d", decMode->Header.MediumType);
if(decMode->Header.descriptorsLength > 0)
@@ -1305,7 +1305,7 @@ void MmcReport(int fd, xmlTextWriterPtr xmlWriter, unsigned char *cdromMode)
}
// All BDs but BD-ROM
if(i >= 1 || i <= 4)
if(i >= 1 && i <= 4)
{
printf("Querying BD DDS...\n");
xmlTextWriterWriteFormatElement(xmlWriter, BAD_CAST "CanReadDDS", "%s",
@@ -1376,7 +1376,7 @@ void MmcReport(int fd, xmlTextWriterPtr xmlWriter, unsigned char *cdromMode)
}
// All BDs
if(i >= 16 && i <= 5)
if(i >= 5 && i <= 16)
{
printf("Querying BD Disc Information...\n");
xmlTextWriterWriteFormatElement(xmlWriter, BAD_CAST "CanReadDiscInformation", "%s",
@@ -1758,8 +1758,6 @@ void MmcReport(int fd, xmlTextWriterPtr xmlWriter, unsigned char *cdromMode)
sense[13] == 0x00)
xmlTextWriterWriteFormatElement(xmlWriter, BAD_CAST "SupportsReadLong16", "%s", "true");
int i;
if(supportsReadLong10 && blockSize == longBlockSize)
{
error = ReadLong10(fd, &buffer, &sense, FALSE, FALSE, 0, 37856);

View File

@@ -198,11 +198,11 @@ void SscReport(int fd, xmlTextWriterPtr xmlWriter)
xmlTextWriterStartElement(xmlWriter, BAD_CAST "ModeSense6Data");
xmlTextWriterWriteBase64(xmlWriter, buffer, 0, *(buffer + 0) + 1);
xmlTextWriterEndElement(xmlWriter);
if(!decMode->decoded)
if(decMode == NULL || !decMode->decoded)
decMode = DecodeMode6(buffer, 0x01);
}
if(decMode->decoded)
if(decMode != NULL && decMode->decoded)
{
xmlTextWriterWriteFormatElement(xmlWriter, BAD_CAST "MediumType", "%d", decMode->Header.MediumType);
if(decMode->Header.descriptorsLength > 0)