[PATCH v7 14/14] dlls/oleaut32: Fix nonsensical memory access in ITypeLib2_Constructor_SLTG()

[Edward O'Callaghan]

From: Edward O'Callaghan

Falling onto the other side of the branch results in a later strcmp()
with a uninitialised pointer, make them NULL to be determinstic. Use
calloc() to ensure the heap allocations are zeroed as well.

Signed-off-by: Edward O'Callaghan 
---
 dlls/oleaut32/typelib.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c
index 6c054d98576..4c771dc04ae 100644
--- a/dlls/oleaut32/typelib.c
+++ b/dlls/oleaut32/typelib.c
@@ -4497,23 +4497,23 @@ static ITypeLib2* ITypeLib2_Constructor_SLTG(LPVOID pLib, DWORD dwTLBLength)
    w = *(WORD*)(ptr + 2);
    if(w != 0xffff) {
        len += w;
-	    pOtherTypeInfoBlks[i].index_name = malloc(w + 1);
+	    pOtherTypeInfoBlks[i].index_name = calloc(1, w + 1);
        memcpy(pOtherTypeInfoBlks[i].index_name, ptr + 4, w);
-	    pOtherTypeInfoBlks[i].index_name[w] = '\0';
-	}
+	} else
+	    pOtherTypeInfoBlks[i].index_name = NULL
    w = *(WORD*)(ptr + 4 + len);
    if(w != 0xffff) {
        TRACE_(typelib)("\twith %s\n", debugstr_an(ptr + 6 + len, w));
        len += w;
-	    pOtherTypeInfoBlks[i].other_name = malloc(w + 1);
+	    pOtherTypeInfoBlks[i].other_name = calloc(1, w + 1);
        memcpy(pOtherTypeInfoBlks[i].other_name, ptr + 6 + len, w);
-	    pOtherTypeInfoBlks[i].other_name[w] = '\0';
-	}
+	} else
+	    pOtherTypeInfoBlks[i].other_name = NULL;
    pOtherTypeInfoBlks[i].res1a = *(WORD*)(ptr + len + 6);
    pOtherTypeInfoBlks[i].name_offs = *(WORD*)(ptr + len + 8);
    extra = pOtherTypeInfoBlks[i].more_bytes = *(WORD*)(ptr + 10 + len);
    if(extra) {
-	    pOtherTypeInfoBlks[i].extra = malloc(extra);
+	    pOtherTypeInfoBlks[i].extra = calloc(1, extra);
        memcpy(pOtherTypeInfoBlks[i].extra, ptr + 12, extra);
        len += extra;
    }