oleaut32: Prevent freeing of random memory.

Don't assign type to variant until we're sure we are assigning a value.

oleaut32: Prevent freeing of random memory.
37f1d4cb · Ulrich Czekalla · Alexandre Julliard · fc2ce677 · 37f1d4cb
Commit 37f1d4cb authored Feb 02, 2006 by Ulrich Czekalla Committed by Alexandre Julliard Feb 02, 2006
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

variant.c dlls/oleaut32/variant.c +4 -2

No files found.
--- a/dlls/oleaut32/variant.c
+++ b/dlls/oleaut32/variant.c
@@ -2952,7 +2952,6 @@ HRESULT WINAPI VarAdd(LPVARIANT left, LPVARIANT right, LPVARIANT result)

    /* Do the math */
    hres = S_OK;
-    V_VT(&tv) = tvt;
    V_VT(result) = resvt;
    switch (tvt) {
        case VT_DECIMAL:
@@ -2973,10 +2972,13 @@ HRESULT WINAPI VarAdd(LPVARIANT left, LPVARIANT right, LPVARIANT result)
                V_VT(result) = VT_R8;
                V_R8(result) = r8res;
                goto end;
-            } else
+            } else {
+                V_VT(&tv) = tvt;
                V_I8(&tv) = V_I8(&lv) + V_I8(&rv);
+            }
            break;
        case VT_R8:
+            V_VT(&tv) = tvt;
            /* FIXME: overflow detection */
            V_R8(&tv) = V_R8(&lv) + V_R8(&rv);
            break;