mirror of
https://github.com/reactos/reactos.git
synced 2024-09-28 21:44:31 +00:00
[SETUPAPI] cfgmgr.c: Do not debugstr_*(pszVetoName) (#6027)
which is an _Out_ parameter. Fixes "uninitialized" data read.
This commit is contained in:
parent
6cdaad13bd
commit
5b5aaf6687
|
@ -6586,8 +6586,8 @@ CM_Query_And_Remove_SubTreeW(
|
||||||
_In_ ULONG ulNameLength,
|
_In_ ULONG ulNameLength,
|
||||||
_In_ ULONG ulFlags)
|
_In_ ULONG ulFlags)
|
||||||
{
|
{
|
||||||
TRACE("CM_Query_And_Remove_SubTreeW(%lx %p %s %lu %lx)\n",
|
TRACE("CM_Query_And_Remove_SubTreeW(%lx %p %p %lu %lx)\n",
|
||||||
dnAncestor, pVetoType, debugstr_w(pszVetoName), ulNameLength, ulFlags);
|
dnAncestor, pVetoType, pszVetoName, ulNameLength, ulFlags);
|
||||||
|
|
||||||
return CM_Query_And_Remove_SubTree_ExW(dnAncestor, pVetoType, pszVetoName,
|
return CM_Query_And_Remove_SubTree_ExW(dnAncestor, pVetoType, pszVetoName,
|
||||||
ulNameLength, ulFlags, NULL);
|
ulNameLength, ulFlags, NULL);
|
||||||
|
@ -6610,8 +6610,8 @@ CM_Query_And_Remove_SubTree_ExA(
|
||||||
LPWSTR lpLocalVetoName;
|
LPWSTR lpLocalVetoName;
|
||||||
CONFIGRET ret;
|
CONFIGRET ret;
|
||||||
|
|
||||||
TRACE("CM_Query_And_Remove_SubTree_ExA(%lx %p %s %lu %lx %p)\n",
|
TRACE("CM_Query_And_Remove_SubTree_ExA(%lx %p %p %lu %lx %p)\n",
|
||||||
dnAncestor, pVetoType, debugstr_a(pszVetoName), ulNameLength,
|
dnAncestor, pVetoType, pszVetoName, ulNameLength,
|
||||||
ulFlags, hMachine);
|
ulFlags, hMachine);
|
||||||
|
|
||||||
if (pszVetoName == NULL && ulNameLength == 0)
|
if (pszVetoName == NULL && ulNameLength == 0)
|
||||||
|
@ -6660,8 +6660,8 @@ CM_Query_And_Remove_SubTree_ExW(
|
||||||
LPWSTR lpDevInst;
|
LPWSTR lpDevInst;
|
||||||
CONFIGRET ret;
|
CONFIGRET ret;
|
||||||
|
|
||||||
TRACE("CM_Query_And_Remove_SubTree_ExW(%lx %p %s %lu %lx %p)\n",
|
TRACE("CM_Query_And_Remove_SubTree_ExW(%lx %p %p %lu %lx %p)\n",
|
||||||
dnAncestor, pVetoType, debugstr_w(pszVetoName), ulNameLength,
|
dnAncestor, pVetoType, pszVetoName, ulNameLength,
|
||||||
ulFlags, hMachine);
|
ulFlags, hMachine);
|
||||||
|
|
||||||
if (dnAncestor == 0)
|
if (dnAncestor == 0)
|
||||||
|
@ -7442,8 +7442,8 @@ CM_Request_Device_EjectA(
|
||||||
_In_ ULONG ulNameLength,
|
_In_ ULONG ulNameLength,
|
||||||
_In_ ULONG ulFlags)
|
_In_ ULONG ulFlags)
|
||||||
{
|
{
|
||||||
TRACE("CM_Request_Device_EjectA(%lx %p %s %lu %lx)\n",
|
TRACE("CM_Request_Device_EjectA(%lx %p %p %lu %lx)\n",
|
||||||
dnDevInst, pVetoType, debugstr_a(pszVetoName), ulNameLength, ulFlags);
|
dnDevInst, pVetoType, pszVetoName, ulNameLength, ulFlags);
|
||||||
|
|
||||||
return CM_Request_Device_Eject_ExA(dnDevInst, pVetoType, pszVetoName,
|
return CM_Request_Device_Eject_ExA(dnDevInst, pVetoType, pszVetoName,
|
||||||
ulNameLength, ulFlags, NULL);
|
ulNameLength, ulFlags, NULL);
|
||||||
|
@ -7462,8 +7462,8 @@ CM_Request_Device_EjectW(
|
||||||
_In_ ULONG ulNameLength,
|
_In_ ULONG ulNameLength,
|
||||||
_In_ ULONG ulFlags)
|
_In_ ULONG ulFlags)
|
||||||
{
|
{
|
||||||
TRACE("CM_Request_Device_EjectW(%lx %p %s %lu %lx)\n",
|
TRACE("CM_Request_Device_EjectW(%lx %p %p %lu %lx)\n",
|
||||||
dnDevInst, pVetoType, debugstr_w(pszVetoName), ulNameLength, ulFlags);
|
dnDevInst, pVetoType, pszVetoName, ulNameLength, ulFlags);
|
||||||
|
|
||||||
return CM_Request_Device_Eject_ExW(dnDevInst, pVetoType, pszVetoName,
|
return CM_Request_Device_Eject_ExW(dnDevInst, pVetoType, pszVetoName,
|
||||||
ulNameLength, ulFlags, NULL);
|
ulNameLength, ulFlags, NULL);
|
||||||
|
@ -7486,8 +7486,8 @@ CM_Request_Device_Eject_ExA(
|
||||||
LPWSTR lpLocalVetoName = NULL;
|
LPWSTR lpLocalVetoName = NULL;
|
||||||
CONFIGRET ret;
|
CONFIGRET ret;
|
||||||
|
|
||||||
TRACE("CM_Request_Device_Eject_ExA(%lx %p %s %lu %lx %p)\n",
|
TRACE("CM_Request_Device_Eject_ExA(%lx %p %p %lu %lx %p)\n",
|
||||||
dnDevInst, pVetoType, debugstr_a(pszVetoName), ulNameLength, ulFlags, hMachine);
|
dnDevInst, pVetoType, pszVetoName, ulNameLength, ulFlags, hMachine);
|
||||||
|
|
||||||
if (ulNameLength != 0)
|
if (ulNameLength != 0)
|
||||||
{
|
{
|
||||||
|
@ -7538,8 +7538,8 @@ CM_Request_Device_Eject_ExW(
|
||||||
LPWSTR lpDevInst;
|
LPWSTR lpDevInst;
|
||||||
CONFIGRET ret;
|
CONFIGRET ret;
|
||||||
|
|
||||||
TRACE("CM_Request_Device_Eject_ExW(%lx %p %s %lu %lx %p)\n",
|
TRACE("CM_Request_Device_Eject_ExW(%lx %p %p %lu %lx %p)\n",
|
||||||
dnDevInst, pVetoType, debugstr_w(pszVetoName), ulNameLength, ulFlags, hMachine);
|
dnDevInst, pVetoType, pszVetoName, ulNameLength, ulFlags, hMachine);
|
||||||
|
|
||||||
if (dnDevInst == 0)
|
if (dnDevInst == 0)
|
||||||
return CR_INVALID_DEVNODE;
|
return CR_INVALID_DEVNODE;
|
||||||
|
|
Loading…
Reference in a new issue