Cleanly initialize structures for mapi_response

diff --git a/libmapi/IUnknown.c b/libmapi/IUnknown.c
index 44c1eb60cef7969574663fb9d5431082fe295ed4..85988b938eec87504e6e70ed8e64c4ec161d4200 100644 (file)
--- a/libmapi/IUnknown.c
+++ b/libmapi/IUnknown.c
@@ -122,6 +122,8 @@ _PUBLIC_ enum MAPISTATUS Release(mapi_object_t *obj)
        enum MAPISTATUS         retval;
        uint8_t                 logon_id = 0;
 
+       mapi_response = 0;
+
        /* Sanity checks */
        session = mapi_object_get_session(obj);
        OPENCHANGE_RETVAL_IF(!session, MAPI_E_INVALID_PARAMETER, NULL);

diff --git a/ndr_mapi.c b/ndr_mapi.c
index 2448178d55de479590a7babe5e7a46791670c76c..d1e661d1ba6b8ff93754eb0a36ba08459a70660a 100644 (file)
--- a/ndr_mapi.c
+++ b/ndr_mapi.c
@@ -633,7 +633,7 @@ enum ndr_err_code ndr_pull_mapi_response(struct ndr_pull *ndr, int ndr_flags, st
        /* If length equals length field then skipping subcontext */
        if (r->length > sizeof (uint16_t)) {
                _mem_save_mapi_repl_0 = NDR_PULL_GET_MEM_CTX(ndr);
-               r->mapi_repl = talloc_array(_mem_save_mapi_repl_0, struct EcDoRpc_MAPI_REPL, 2);
+               r->mapi_repl = talloc_zero_array(_mem_save_mapi_repl_0, struct EcDoRpc_MAPI_REPL, 2);
                NDR_CHECK(ndr_pull_subcontext_start(ndr, &_ndr_mapi_repl, 0, r->length - 2));
                for (cntr_mapi_repl_0 = 0; _ndr_mapi_repl->offset < _ndr_mapi_repl->data_size - 2; cntr_mapi_repl_0++) {
                        NDR_CHECK(ndr_pull_EcDoRpc_MAPI_REPL(_ndr_mapi_repl, NDR_SCALARS, &r->mapi_repl[cntr_mapi_repl_0]));
@@ -642,6 +642,8 @@ enum ndr_err_code ndr_pull_mapi_response(struct ndr_pull *ndr, int ndr_flags, st
                r->mapi_repl[cntr_mapi_repl_0].opnum = 0;
                NDR_CHECK(ndr_pull_subcontext_end(ndr, _ndr_mapi_repl, 4, -1));
                talloc_free(_ndr_mapi_repl);
+       } else {
+               r->mapi_repl = NULL;
        }
 
        _mem_save_handles_0 = NDR_PULL_GET_MEM_CTX(ndr);