Add a NULL check and some const to dcerpc_floor_get_lhs_data()

diff --git a/librpc/rpc/binding.c b/librpc/rpc/binding.c
index a660989d198d17f1d861aa8ead11fe677b2b9b0c..4f36faca7965c6016f138d7fad1c21cc6a13d641 100644 (file)
--- a/librpc/rpc/binding.c
+++ b/librpc/rpc/binding.c
@@ -370,13 +370,19 @@ _PUBLIC_ NTSTATUS dcerpc_parse_binding(TALLOC_CTX *mem_ctx, const char *s, struc
        return NT_STATUS_OK;
 }
 
        return NT_STATUS_OK;
 }
 

-_PUBLIC_ NTSTATUS dcerpc_floor_get_lhs_data(struct epm_floor *epm_floor, struct ndr_syntax_id *syntax)
+_PUBLIC_ NTSTATUS dcerpc_floor_get_lhs_data(const struct epm_floor *epm_floor,
+                                           struct ndr_syntax_id *syntax)

 {
        TALLOC_CTX *mem_ctx = talloc_init("floor_get_lhs_data");
 {
        TALLOC_CTX *mem_ctx = talloc_init("floor_get_lhs_data");

-       struct ndr_pull *ndr = ndr_pull_init_blob(&epm_floor->lhs.lhs_data, mem_ctx, NULL);
+       struct ndr_pull *ndr;

        enum ndr_err_code ndr_err;
        uint16_t if_version=0;
 
        enum ndr_err_code ndr_err;
        uint16_t if_version=0;
 

+       ndr = ndr_pull_init_blob(&epm_floor->lhs.lhs_data, mem_ctx, NULL);
+       if (ndr == NULL) {
+               talloc_free(mem_ctx);
+               return NT_STATUS_NO_MEMORY;
+       }

        ndr->flags |= LIBNDR_FLAG_NOALIGN;
 
        ndr_err = ndr_pull_GUID(ndr, NDR_SCALARS | NDR_BUFFERS, &syntax->uuid);
        ndr->flags |= LIBNDR_FLAG_NOALIGN;
 
        ndr_err = ndr_pull_GUID(ndr, NDR_SCALARS | NDR_BUFFERS, &syntax->uuid);

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 826900c7aed2964dd7177c45e13a5a812f253f7c..c9185154f8da68e5a25883b4037dc2cb929e7094 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -2288,7 +2288,8 @@ char *dom_sid_string(TALLOC_CTX *mem_ctx, const struct dom_sid *sid);
 const char *epm_floor_string(TALLOC_CTX *mem_ctx, struct epm_floor *epm_floor);
 _PUBLIC_ char *dcerpc_binding_string(TALLOC_CTX *mem_ctx, const struct dcerpc_binding *b);
 _PUBLIC_ NTSTATUS dcerpc_parse_binding(TALLOC_CTX *mem_ctx, const char *s, struct dcerpc_binding **b_out);
 const char *epm_floor_string(TALLOC_CTX *mem_ctx, struct epm_floor *epm_floor);
 _PUBLIC_ char *dcerpc_binding_string(TALLOC_CTX *mem_ctx, const struct dcerpc_binding *b);
 _PUBLIC_ NTSTATUS dcerpc_parse_binding(TALLOC_CTX *mem_ctx, const char *s, struct dcerpc_binding **b_out);

-_PUBLIC_ NTSTATUS dcerpc_floor_get_lhs_data(struct epm_floor *epm_floor, struct ndr_syntax_id *syntax);
+_PUBLIC_ NTSTATUS dcerpc_floor_get_lhs_data(const struct epm_floor *epm_floor,
+                                           struct ndr_syntax_id *syntax);

 const char *dcerpc_floor_get_rhs_data(TALLOC_CTX *mem_ctx, struct epm_floor *epm_floor);
 enum dcerpc_transport_t dcerpc_transport_by_endpoint_protocol(int prot);
 _PUBLIC_ enum dcerpc_transport_t dcerpc_transport_by_tower(struct epm_tower *tower);
 const char *dcerpc_floor_get_rhs_data(TALLOC_CTX *mem_ctx, struct epm_floor *epm_floor);
 enum dcerpc_transport_t dcerpc_transport_by_endpoint_protocol(int prot);
 _PUBLIC_ enum dcerpc_transport_t dcerpc_transport_by_tower(struct epm_tower *tower);