https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5b5aaf6687b443aa010ae055ec005a23a0e4c337
commit 5b5aaf6687b443aa010ae055ec005a23a0e4c337 Author: Serge Gautherie <[email protected]> AuthorDate: Wed Nov 22 22:35:00 2023 +0100 Commit: GitHub <[email protected]> CommitDate: Wed Nov 22 22:35:00 2023 +0100 [SETUPAPI] cfgmgr.c: Do not debugstr_*(pszVetoName) (#6027) which is an _Out_ parameter. Fixes "uninitialized" data read. --- dll/win32/setupapi/cfgmgr.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dll/win32/setupapi/cfgmgr.c b/dll/win32/setupapi/cfgmgr.c index 3ab1d6969ce..1b25536f9e3 100644 --- a/dll/win32/setupapi/cfgmgr.c +++ b/dll/win32/setupapi/cfgmgr.c @@ -6586,8 +6586,8 @@ CM_Query_And_Remove_SubTreeW( _In_ ULONG ulNameLength, _In_ ULONG ulFlags) { - TRACE("CM_Query_And_Remove_SubTreeW(%lx %p %s %lu %lx)\n", - dnAncestor, pVetoType, debugstr_w(pszVetoName), ulNameLength, ulFlags); + TRACE("CM_Query_And_Remove_SubTreeW(%lx %p %p %lu %lx)\n", + dnAncestor, pVetoType, pszVetoName, ulNameLength, ulFlags); return CM_Query_And_Remove_SubTree_ExW(dnAncestor, pVetoType, pszVetoName, ulNameLength, ulFlags, NULL); @@ -6610,8 +6610,8 @@ CM_Query_And_Remove_SubTree_ExA( LPWSTR lpLocalVetoName; CONFIGRET ret; - TRACE("CM_Query_And_Remove_SubTree_ExA(%lx %p %s %lu %lx %p)\n", - dnAncestor, pVetoType, debugstr_a(pszVetoName), ulNameLength, + TRACE("CM_Query_And_Remove_SubTree_ExA(%lx %p %p %lu %lx %p)\n", + dnAncestor, pVetoType, pszVetoName, ulNameLength, ulFlags, hMachine); if (pszVetoName == NULL && ulNameLength == 0) @@ -6660,8 +6660,8 @@ CM_Query_And_Remove_SubTree_ExW( LPWSTR lpDevInst; CONFIGRET ret; - TRACE("CM_Query_And_Remove_SubTree_ExW(%lx %p %s %lu %lx %p)\n", - dnAncestor, pVetoType, debugstr_w(pszVetoName), ulNameLength, + TRACE("CM_Query_And_Remove_SubTree_ExW(%lx %p %p %lu %lx %p)\n", + dnAncestor, pVetoType, pszVetoName, ulNameLength, ulFlags, hMachine); if (dnAncestor == 0) @@ -7442,8 +7442,8 @@ CM_Request_Device_EjectA( _In_ ULONG ulNameLength, _In_ ULONG ulFlags) { - TRACE("CM_Request_Device_EjectA(%lx %p %s %lu %lx)\n", - dnDevInst, pVetoType, debugstr_a(pszVetoName), ulNameLength, ulFlags); + TRACE("CM_Request_Device_EjectA(%lx %p %p %lu %lx)\n", + dnDevInst, pVetoType, pszVetoName, ulNameLength, ulFlags); return CM_Request_Device_Eject_ExA(dnDevInst, pVetoType, pszVetoName, ulNameLength, ulFlags, NULL); @@ -7462,8 +7462,8 @@ CM_Request_Device_EjectW( _In_ ULONG ulNameLength, _In_ ULONG ulFlags) { - TRACE("CM_Request_Device_EjectW(%lx %p %s %lu %lx)\n", - dnDevInst, pVetoType, debugstr_w(pszVetoName), ulNameLength, ulFlags); + TRACE("CM_Request_Device_EjectW(%lx %p %p %lu %lx)\n", + dnDevInst, pVetoType, pszVetoName, ulNameLength, ulFlags); return CM_Request_Device_Eject_ExW(dnDevInst, pVetoType, pszVetoName, ulNameLength, ulFlags, NULL); @@ -7486,8 +7486,8 @@ CM_Request_Device_Eject_ExA( LPWSTR lpLocalVetoName = NULL; CONFIGRET ret; - TRACE("CM_Request_Device_Eject_ExA(%lx %p %s %lu %lx %p)\n", - dnDevInst, pVetoType, debugstr_a(pszVetoName), ulNameLength, ulFlags, hMachine); + TRACE("CM_Request_Device_Eject_ExA(%lx %p %p %lu %lx %p)\n", + dnDevInst, pVetoType, pszVetoName, ulNameLength, ulFlags, hMachine); if (ulNameLength != 0) { @@ -7538,8 +7538,8 @@ CM_Request_Device_Eject_ExW( LPWSTR lpDevInst; CONFIGRET ret; - TRACE("CM_Request_Device_Eject_ExW(%lx %p %s %lu %lx %p)\n", - dnDevInst, pVetoType, debugstr_w(pszVetoName), ulNameLength, ulFlags, hMachine); + TRACE("CM_Request_Device_Eject_ExW(%lx %p %p %lu %lx %p)\n", + dnDevInst, pVetoType, pszVetoName, ulNameLength, ulFlags, hMachine); if (dnDevInst == 0) return CR_INVALID_DEVNODE;
