Nikolay Sivov : oleaut32: Fix uninitialized variable access in VarXor() for earlier failure paths (Coverity).

Alexandre Julliard julliard at winehq.org
Tue Sep 14 16:00:13 CDT 2021


Module: wine
Branch: master
Commit: e4451427d874f84e2d8c6ce37ef0645f4d21aa16
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=e4451427d874f84e2d8c6ce37ef0645f4d21aa16

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Tue Sep 14 20:12:12 2021 +0300

oleaut32: Fix uninitialized variable access in VarXor() for earlier failure paths (Coverity).

Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/oleaut32/variant.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c
index 2c60f920f5e..bd1ff17c707 100644
--- a/dlls/oleaut32/variant.c
+++ b/dlls/oleaut32/variant.c
@@ -4635,6 +4635,7 @@ HRESULT WINAPI VarXor(LPVARIANT pVarLeft, LPVARIANT pVarRight, LPVARIANT pVarOut
         return S_OK;
     }
 
+    V_VT(&varLeft) = V_VT(&varRight) = VT_EMPTY;
     VariantInit(&tempLeft);
     VariantInit(&tempRight);
 
@@ -4653,8 +4654,6 @@ HRESULT WINAPI VarXor(LPVARIANT pVarLeft, LPVARIANT pVarRight, LPVARIANT pVarOut
     }
 
     /* Copy our inputs so we don't disturb anything */
-    V_VT(&varLeft) = V_VT(&varRight) = VT_EMPTY;
-
     hRet = VariantCopy(&varLeft, pVarLeft);
     if (FAILED(hRet))
         goto VarXor_Exit;




More information about the wine-cvs mailing list