Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-29 02:25:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix incorrect string manipulation in NdisOpenProtocolConfiguration and add few casts to make compiler happy.

Browse source 
svn path=/trunk/; revision=17486
This commit is contained in:
Filip Navara 2005-08-23 20:13:31 +00:00
parent 4a6a7d1ccc
commit eea6d92c91
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
reactos/drivers/net/ndis/ndis/config.c
View file

@ -31,7 +31,6 @@
* - All the routines in this file are PASSIVE_LEVEL only, and all memory is PagedPool * - All the routines in this file are PASSIVE_LEVEL only, and all memory is PagedPool
*/ */
#include <roscfg.h>
#include "ndissys.h" #include "ndissys.h"
#define NDIS_VERSION 0x00040000 /* the version of NDIS we claim to be to miniport drivers */ #define NDIS_VERSION 0x00040000 /* the version of NDIS we claim to be to miniport drivers */
@ -236,12 +235,13 @@ NdisOpenProtocolConfiguration(
{ {
OBJECT_ATTRIBUTES KeyAttributes; OBJECT_ATTRIBUTES KeyAttributes;
UNICODE_STRING KeyNameU; UNICODE_STRING KeyNameU;
WCHAR *KeyName;
HANDLE KeyHandle; HANDLE KeyHandle;
PMINIPORT_CONFIGURATION_CONTEXT ConfigurationContext; PMINIPORT_CONFIGURATION_CONTEXT ConfigurationContext;
KeyName = ExAllocatePool(PagedPool, ProtocolSection->Length + sizeof(PARAMETERS_KEY) + sizeof(WCHAR)); KeyNameU.Length = 0;
if(!KeyName) KeyNameU.MaximumLength = ProtocolSection->Length + sizeof(PARAMETERS_KEY) + sizeof(UNICODE_NULL);
KeyNameU.Buffer = ExAllocatePool(PagedPool, KeyNameU.MaximumLength);
if(!KeyNameU.Buffer)
{ {
NDIS_DbgPrint(MIN_TRACE,("Insufficient resources.\n")); NDIS_DbgPrint(MIN_TRACE,("Insufficient resources.\n"));
*ConfigurationHandle = NULL; *ConfigurationHandle = NULL;
@ -249,14 +249,13 @@ NdisOpenProtocolConfiguration(
return; return;
} }
wcsncpy(KeyName, ProtocolSection->Buffer, ProtocolSection->Length/sizeof(WCHAR)); RtlCopyUnicodeString(&KeyNameU, ProtocolSection);
wcscpy(KeyName + ProtocolSection->Length, PARAMETERS_KEY); RtlAppendUnicodeToString(&KeyNameU, PARAMETERS_KEY);
RtlInitUnicodeString(&KeyNameU, KeyName);
InitializeObjectAttributes(&KeyAttributes, &KeyNameU, OBJ_CASE_INSENSITIVE, NULL, NULL); InitializeObjectAttributes(&KeyAttributes, &KeyNameU, OBJ_CASE_INSENSITIVE, NULL, NULL);
*Status = ZwOpenKey(&KeyHandle, KEY_ALL_ACCESS, &KeyAttributes); *Status = ZwOpenKey(&KeyHandle, KEY_ALL_ACCESS, &KeyAttributes);
ExFreePool(KeyName); ExFreePool(KeyNameU.Buffer);
if(*Status != NDIS_STATUS_SUCCESS) if(*Status != NDIS_STATUS_SUCCESS)
{ {
@ -490,7 +489,7 @@ NdisReadConfiguration(
return; return;
} }
str.Length = str.MaximumLength = KeyInformation->DataLength; str.Length = str.MaximumLength = (USHORT)KeyInformation->DataLength;
str.Buffer = (PWCHAR)KeyInformation->Data; str.Buffer = (PWCHAR)KeyInformation->Data;
(*ParameterValue)->ParameterType = ParameterType; (*ParameterValue)->ParameterType = ParameterType;
@ -560,7 +559,7 @@ NdisReadConfiguration(
memcpy(RegData, KeyInformation->Data, KeyInformation->DataLength); memcpy(RegData, KeyInformation->Data, KeyInformation->DataLength);
(*ParameterValue)->ParameterType = ParameterType; (*ParameterValue)->ParameterType = ParameterType;
(*ParameterValue)->ParameterData.StringData.Length = KeyInformation->DataLength; (*ParameterValue)->ParameterData.StringData.Length = (USHORT)KeyInformation->DataLength;
(*ParameterValue)->ParameterData.StringData.Buffer = RegData; (*ParameterValue)->ParameterData.StringData.Buffer = RegData;
ExFreePool(KeyInformation); ExFreePool(KeyInformation);
@ -805,7 +804,7 @@ NdisOpenConfigurationKeyByIndex(
/* should i fail instead if the passed-in string isn't long enough? */ /* should i fail instead if the passed-in string isn't long enough? */
wcsncpy(KeyName->Buffer, KeyInformation->Name, KeyName->MaximumLength/sizeof(WCHAR)); wcsncpy(KeyName->Buffer, KeyInformation->Name, KeyName->MaximumLength/sizeof(WCHAR));
KeyName->Length = KeyInformation->NameLength; KeyName->Length = (USHORT)KeyInformation->NameLength;
InitializeObjectAttributes(&KeyAttributes, KeyName, OBJ_CASE_INSENSITIVE, ConfigurationHandle, NULL); InitializeObjectAttributes(&KeyAttributes, KeyName, OBJ_CASE_INSENSITIVE, ConfigurationHandle, NULL);