Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-05-22 21:32:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

[FREELDR] BuildArgvForOsLoader: Add a terminating NULL pointer to the Argv vector.

Browse source 
Addendum to commits d05be0da3 and bd451f240.

This is required for POSIX compliance, which the ARC specification obeys.

See Section 2.1.2.2.1 (ANSI X3.159-1989) or 5.1.2.2.1 (ISO/IEC 9899:x)
"Program startup":
```
If they are declared, the parameters to the main function shall obey
the following constraints:
— The value of argc shall be nonnegative.
— argv[argc] shall be a null pointer.
[...]
```

See also https://pubs.opengroup.org/onlinepubs/9699919799/functions/exec.html
This commit is contained in:
Hermès Bélusca-Maïto 2024-04-05 17:05:13 +02:00
parent 6cb18bc6a4
commit 5b2dcdd03d
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
1 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
boot/freeldr/freeldr/bootmgr.c
View file

@ -100,17 +100,18 @@ GetOSLoadingMethod(
UNREACHABLE; UNREACHABLE;
} }
/* /**
* This function converts the list of key=value options in the given operating * @brief
* This function converts the list of Key=Value options in the given operating
* system section into an ARC-compatible argument vector, providing in addition * system section into an ARC-compatible argument vector, providing in addition
* the extra mandatory Software Loading Environment Variables, following the * the extra mandatory Software Loading Environment Variables, following the
* ARC specification. * ARC specification.
*/ **/
static PCHAR* static PCHAR*
BuildArgvForOsLoader( BuildArgvForOsLoader(
IN PCSTR LoadIdentifier, _In_ PCSTR LoadIdentifier,
IN ULONG_PTR SectionId, _In_ ULONG_PTR SectionId,
OUT PULONG pArgc) _Out_ PULONG pArgc)
{ {
SIZE_T Size; SIZE_T Size;
ULONG Count; ULONG Count;
@ -124,7 +125,7 @@ BuildArgvForOsLoader(
ASSERT(SectionId != 0); ASSERT(SectionId != 0);
/* Validate the LoadIdentifier (to make tests simpler later) */ /* Normalize LoadIdentifier to make subsequent tests simpler */
if (LoadIdentifier && !*LoadIdentifier) if (LoadIdentifier && !*LoadIdentifier)
LoadIdentifier = NULL; LoadIdentifier = NULL;
@ -134,19 +135,24 @@ BuildArgvForOsLoader(
/* /*
* The argument vector contains the program name, the SystemPartition, * The argument vector contains the program name, the SystemPartition,
* the LoadIdentifier (optional), and the items in the OS section. * the LoadIdentifier (optional), and the items in the OS section.
* For POSIX compliance, a terminating NULL pointer (not counted in Argc)
* is appended, such that Argv[Argc] == NULL.
*/ */
Argc = 2 + (LoadIdentifier ? 1 : 0) + Count; Argc = 2 + (LoadIdentifier ? 1 : 0) + Count;
/* Calculate the total size needed for the string buffer of the argument vector */ /* Calculate the total size needed for the string buffer of the argument vector */
Size = 0; Size = 0;
/* i == 0: Program name */ /* i == 0: Program name */
// TODO: Provide one in the future...
/* i == 1: SystemPartition : from where FreeLdr has been started */ /* i == 1: SystemPartition : from where FreeLdr has been started */
Size += (strlen("SystemPartition=") + strlen(FrLdrBootPath) + 1) * sizeof(CHAR); Size += (strlen("SystemPartition=") + strlen(FrLdrBootPath) + 1) * sizeof(CHAR);
/* i == 2: LoadIdentifier : ASCII string that may be used to associate an identifier with a set of load parameters */ /* i == 2: LoadIdentifier : ASCII string that may be used
* to associate an identifier with a set of load parameters */
if (LoadIdentifier) if (LoadIdentifier)
{ {
Size += (strlen("LoadIdentifier=") + strlen(LoadIdentifier) + 1) * sizeof(CHAR); Size += (strlen("LoadIdentifier=") + strlen(LoadIdentifier) + 1) * sizeof(CHAR);
} }
/* The section items */
for (i = 0; i < Count; ++i) for (i = 0; i < Count; ++i)
{ {
Size += IniGetSectionSettingNameSize(SectionId, i); // Counts also the NULL-terminator, that we transform into the '=' sign separator. Size += IniGetSectionSettingNameSize(SectionId, i); // Counts also the NULL-terminator, that we transform into the '=' sign separator.
@ -155,15 +161,15 @@ BuildArgvForOsLoader(
Size += sizeof(ANSI_NULL); // Final NULL-terminator. Size += sizeof(ANSI_NULL); // Final NULL-terminator.
/* Allocate memory to hold the argument vector: pointers and string buffer */ /* Allocate memory to hold the argument vector: pointers and string buffer */
Argv = FrLdrHeapAlloc(Argc * sizeof(PCHAR) + Size, TAG_STRING); Argv = FrLdrHeapAlloc((Argc + 1) * sizeof(PCHAR) + Size, TAG_STRING);
if (!Argv) if (!Argv)
return NULL; return NULL;
/* Initialize the argument vector: loop through the section and copy the key=value options */ /* Initialize the argument vector: loop through the section and copy the Key=Value options */
SettingName = (PCHAR)((ULONG_PTR)Argv + (Argc * sizeof(PCHAR))); SettingName = (PCHAR)((ULONG_PTR)Argv + ((Argc + 1) * sizeof(PCHAR)));
Args = Argv; Args = Argv;
/* i == 0: Program name */ /* i == 0: Program name */
*Args++ = NULL; *Args++ = NULL; // TODO: Provide one in the future...
/* i == 1: SystemPartition */ /* i == 1: SystemPartition */
{ {
strcpy(SettingName, "SystemPartition="); strcpy(SettingName, "SystemPartition=");
@ -181,6 +187,7 @@ BuildArgvForOsLoader(
*Args++ = SettingName; *Args++ = SettingName;
SettingName += (strlen(SettingName) + 1); SettingName += (strlen(SettingName) + 1);
} }
/* The section items */
for (i = 0; i < Count; ++i) for (i = 0; i < Count; ++i)
{ {
Size = IniGetSectionSettingNameSize(SectionId, i); Size = IniGetSectionSettingNameSize(SectionId, i);
@ -193,6 +200,8 @@ BuildArgvForOsLoader(
*Args++ = SettingName; *Args++ = SettingName;
SettingName += (strlen(SettingName) + 1); SettingName += (strlen(SettingName) + 1);
} }
/* Terminating NULL pointer */
*Args = NULL;
#if DBG #if DBG
/* Dump the argument vector for debugging */ /* Dump the argument vector for debugging */