diff options
| author | Volker Lendecke <vl@samba.org> | 2009-01-06 21:24:30 +0100 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2009-01-06 21:25:18 +0100 |
| commit | e92b7abca083de7acf03b0211ccc8ca935398794 (patch) | |
| tree | f07fb2992f84ef0dfb220682d519c283ceaf19a6 | |
| parent | 05f97d32358168efdad111be9c36f61e011d4466 (diff) | |
| download | samba-e92b7abca083de7acf03b0211ccc8ca935398794.tar.gz samba-e92b7abca083de7acf03b0211ccc8ca935398794.tar.bz2 samba-e92b7abca083de7acf03b0211ccc8ca935398794.zip | |
Add a NULL check and some const to dcerpc_floor_get_lhs_data()
| -rw-r--r-- | librpc/rpc/binding.c | 10 | ||||
| -rw-r--r-- | source3/include/proto.h | 3 |
2 files changed, 10 insertions, 3 deletions
diff --git a/librpc/rpc/binding.c b/librpc/rpc/binding.c index a660989d19..4f36faca79 100644 --- 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; } -_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"); - 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; + 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); diff --git a/source3/include/proto.h b/source3/include/proto.h index 826900c7ae..c9185154f8 100644 --- 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); -_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); |