Change strncpy calls to RtlStringSbCopyA (PART 1/x)
Fix bug in MmLoadSystemImage which caused FileName parameter to be freed
svn path=/trunk/; revision=51138
- strncpy(Buffer, LastCommand, Size);
- Buffer[Size - 1] = '\0';
+ RtlStringCbCopyA(Buffer, Size, LastCommand);
- strncpy(LastCommand, Orig, sizeof (LastCommand));
- LastCommand[sizeof (LastCommand) - 1] = '\0';
+ RtlStringCbCopyA(LastCommand, sizeof(LastCommand), Orig);
static PCH Argv[256];
static CHAR OrigCommand[1024];
static PCH Argv[256];
static CHAR OrigCommand[1024];
- strncpy(OrigCommand, Command, sizeof(OrigCommand) - 1);
- OrigCommand[sizeof(OrigCommand) - 1] = '\0';
+ RtlStringCbCopyA(OrigCommand, sizeof(OrigCommand), Command);
WCHAR PathSetup[] = L"\\SystemRoot\\";
CHAR DriverNameLow[256];
ULONG Base;
WCHAR PathSetup[] = L"\\SystemRoot\\";
CHAR DriverNameLow[256];
ULONG Base;
+ size_t Remaining;
+ WCHAR *StringEnd;
#if defined(_PPC_)
ULONG KernelBase = RosLoaderBlock->ModsAddr[0].ModStart;
#endif
#if defined(_PPC_)
ULONG KernelBase = RosLoaderBlock->ModsAddr[0].ModStart;
#endif
/* Construct a correct full name */
BldrModuleStringsFull[i][0] = 0;
/* Construct a correct full name */
BldrModuleStringsFull[i][0] = 0;
- LdrEntry->FullDllName.MaximumLength = 260 * sizeof(WCHAR);
+ LdrEntry->FullDllName.MaximumLength = sizeof(BldrModuleStringsFull[i]);
LdrEntry->FullDllName.Length = 0;
LdrEntry->FullDllName.Buffer = BldrModuleStringsFull[i];
LdrEntry->FullDllName.Length = 0;
LdrEntry->FullDllName.Buffer = BldrModuleStringsFull[i];
/* Find the first \, separating the ARC path from NT path */
BootPath = strchr(CommandLine, '\\');
*BootPath = ANSI_NULL;
/* Find the first \, separating the ARC path from NT path */
BootPath = strchr(CommandLine, '\\');
*BootPath = ANSI_NULL;
- strncpy(BldrArcBootPath, CommandLine, 63);
+ RtlStringCbCopyA(BldrArcBootPath, sizeof(BldrArcBootPath), CommandLine);
LoaderBlock->ArcBootDeviceName = BldrArcBootPath;
/* The rest of the string is the NT path */
HalPath = strchr(BootPath + 1, ' ');
*HalPath = ANSI_NULL;
LoaderBlock->ArcBootDeviceName = BldrArcBootPath;
/* The rest of the string is the NT path */
HalPath = strchr(BootPath + 1, ' ');
*HalPath = ANSI_NULL;
- BldrNtBootPath[0] = '\\';
- strncat(BldrNtBootPath, BootPath + 1, 61);
- strcat(BldrNtBootPath,"\\");
+ Remaining = sizeof(BldrNtBootPath);
+ RtlStringCbCopyExA(BldrNtBootPath, Remaining, "\\", &StringEnd, &Remaining, 0);
+ RtlStringCbCopyExA(StringEnd, Remaining, BootPath + 1, &StringEnd, &Remaining, 0);
+ RtlStringCbCopyA(StringEnd, Remaining, "\\");
LoaderBlock->NtBootPathName = BldrNtBootPath;
/* Set the HAL paths */
LoaderBlock->NtBootPathName = BldrNtBootPath;
/* Set the HAL paths */
- strncpy(BldrArcHalPath, BldrArcBootPath, 63);
+ RtlStringCbCopyA(BldrArcHalPath, sizeof(BldrArcHalPath), BldrArcBootPath);
LoaderBlock->ArcHalDeviceName = BldrArcHalPath;
strcpy(BldrNtHalPath, "\\");
LoaderBlock->NtHalPathName = BldrNtHalPath;
/* Use this new command line */
LoaderBlock->ArcHalDeviceName = BldrArcHalPath;
strcpy(BldrNtHalPath, "\\");
LoaderBlock->NtHalPathName = BldrNtHalPath;
/* Use this new command line */
- strncpy(LoaderBlock->LoadOptions, HalPath + 2, 255);
+ RtlStringCbCopyA(LoaderBlock->LoadOptions, 255, HalPath + 2);
/* Parse it and change every slash to a space */
BootPath = LoaderBlock->LoadOptions;
/* Parse it and change every slash to a space */
BootPath = LoaderBlock->LoadOptions;
NameImport = (PIMAGE_IMPORT_BY_NAME)Name->u1.AddressOfData;
/* Copy the procedure name */
NameImport = (PIMAGE_IMPORT_BY_NAME)Name->u1.AddressOfData;
/* Copy the procedure name */
- strncpy(*MissingApi,
- (PCHAR)&NameImport->Name[0],
- MAXIMUM_FILENAME_LENGTH - 1);
+ RtlStringCbCopyA(*MissingApi,
+ MAXIMUM_FILENAME_LENGTH,
+ (PCHAR)&NameImport->Name[0]);
/* Setup name tables */
DPRINT("Import name: %s\n", NameImport->Name);
/* Setup name tables */
DPRINT("Import name: %s\n", NameImport->Name);
/* If we have a file handle, close it */
if (FileHandle) ZwClose(FileHandle);
/* If we have a file handle, close it */
if (FileHandle) ZwClose(FileHandle);
- /* Check if we had a prefix */
- if (NamePrefix) ExFreePool(PrefixName.Buffer);
+ /* Check if we had a prefix (not supported yet - PrefixName == *FileName now) */
+ /* if (NamePrefix) ExFreePool(PrefixName.Buffer); */
/* Free the name buffer and return status */
ExFreePoolWithTag(Buffer, TAG_LDR_WSTR);
/* Free the name buffer and return status */
ExFreePoolWithTag(Buffer, TAG_LDR_WSTR);