Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-22 23:00:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

[USETUP]

Browse source 
- Don't hardcode buffer string size in GetPartTypeStringFromPartitionType calls.
- Possibly check whether the first character of the PartTypeString string is NULL before printing a generic partition information in case the partition type is unknown. We might check instead for the STRING_FORMATUNKNOWN string...
- Don't check for PartTypeString being NULL since it's not a pointer. CID #1363481 and CID #1363494.

svn path=/trunk/; revision=71911
This commit is contained in:
Hermès Bélusca-Maïto 2016-07-12 22:30:55 +00:00
parent 5ec6f3d9fc
commit 4ef92827aa
2 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
reactos/base/setup/usetup/interface/usetup.c
View file

@ -2403,7 +2403,7 @@ DeletePartitionPage(PINPUT_RECORD Ir)
ULONGLONG DiskSize; ULONGLONG DiskSize;
ULONGLONG PartSize; ULONGLONG PartSize;
PCHAR Unit; PCHAR Unit;
CHAR PartType[32]; CHAR PartTypeString[32];
if (PartitionList == NULL || if (PartitionList == NULL ||
PartitionList->CurrentDisk == NULL || PartitionList->CurrentDisk == NULL ||
@ -2418,7 +2418,9 @@ DeletePartitionPage(PINPUT_RECORD Ir)
MUIDisplayPage(DELETE_PARTITION_PAGE); MUIDisplayPage(DELETE_PARTITION_PAGE);
GetPartTypeStringFromPartitionType(PartEntry->PartitionType, PartType, 30); GetPartTypeStringFromPartitionType(PartEntry->PartitionType,
PartTypeString,
ARRAYSIZE(PartTypeString));
PartSize = PartEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; PartSize = PartEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector;
#if 0 #if 0
@ -2440,7 +2442,7 @@ DeletePartitionPage(PINPUT_RECORD Ir)
Unit = MUIGetString(STRING_KB); Unit = MUIGetString(STRING_KB);
} }
if (PartType == NULL) if (*PartTypeString == '\0') // STRING_FORMATUNKNOWN ??
{ {
CONSOLE_PrintTextXY(6, 10, CONSOLE_PrintTextXY(6, 10,
MUIGetString(STRING_HDDINFOUNK2), MUIGetString(STRING_HDDINFOUNK2),
@ -2456,7 +2458,7 @@ DeletePartitionPage(PINPUT_RECORD Ir)
" %c%c %s %I64u %s", " %c%c %s %I64u %s",
(PartEntry->DriveLetter == 0) ? '-' : PartEntry->DriveLetter, (PartEntry->DriveLetter == 0) ? '-' : PartEntry->DriveLetter,
(PartEntry->DriveLetter == 0) ? '-' : ':', (PartEntry->DriveLetter == 0) ? '-' : ':',
PartType, PartTypeString,
PartSize, PartSize,
Unit); Unit);
} }
@ -2696,7 +2698,9 @@ SelectFileSystemPage(PINPUT_RECORD Ir)
} }
/* adjust partition type */ /* adjust partition type */
GetPartTypeStringFromPartitionType(PartEntry->PartitionType, PartTypeString, 30); GetPartTypeStringFromPartitionType(PartEntry->PartitionType,
PartTypeString,
ARRAYSIZE(PartTypeString));
if (PartEntry->AutoCreate == TRUE) if (PartEntry->AutoCreate == TRUE)
{ {
@ -2707,7 +2711,7 @@ SelectFileSystemPage(PINPUT_RECORD Ir)
PartEntry->PartitionNumber, PartEntry->PartitionNumber,
PartSize, PartSize,
PartUnit, PartUnit,
PartType); PartTypeString);
#endif #endif
CONSOLE_PrintTextXY(8, 10, MUIGetString(STRING_HDINFOPARTZEROED), CONSOLE_PrintTextXY(8, 10, MUIGetString(STRING_HDINFOPARTZEROED),
@ -2750,7 +2754,7 @@ SelectFileSystemPage(PINPUT_RECORD Ir)
{ {
CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_INSTALLONPART)); CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_INSTALLONPART));
if (PartTypeString == NULL) if (*PartTypeString == '\0') // STRING_FORMATUNKNOWN ??
{ {
CONSOLE_PrintTextXY(8, 10, CONSOLE_PrintTextXY(8, 10,
MUIGetString(STRING_HDDINFOUNK4), MUIGetString(STRING_HDDINFOUNK4),

2
reactos/base/setup/usetup/partlist.c
View file

@ -1672,7 +1672,7 @@ PrintPartitionData(
{ {
GetPartTypeStringFromPartitionType(PartEntry->PartitionType, GetPartTypeStringFromPartitionType(PartEntry->PartitionType,
PartTypeString, PartTypeString,
30); ARRAYSIZE(PartTypeString));
PartType = PartTypeString; PartType = PartTypeString;
} }