server: intialize aux_header buffer to null if the data is missing.
authorBrad Hards <bradh@openchange.org>
Sun, 13 Feb 2011 23:33:36 +0000 (23:33 +0000)
committerBrad Hards <bradh@openchange.org>
Sun, 13 Feb 2011 23:33:36 +0000 (23:33 +0000)
This is a merge of r2581 from the plugfest branch.

ndr_mapi.c

index bfc1949bc5eef688faf8964cf48253418eb7aa7d..9d6cedd82fe407d2a1d01f75567781f895db584f 100644 (file)
@@ -429,7 +429,9 @@ _PUBLIC_ enum ndr_err_code ndr_pull_mapi2k7_AuxInfo(struct ndr_pull *ndr, int nd
                                        }
                                }
                                NDR_CHECK(ndr_pull_subcontext_end(ndr, _ndr_buffer, 0, -1));
-                       } 
+                       } else {
+                               r->AUX_HEADER = NULL;
+                       }
                        ndr->flags = _flags_save_DATA_BLOB;
                }
        }