mirror of
https://github.com/samba-team/samba.git
synced 2024-12-25 23:21:54 +03:00
the return value of ndr_pull_set_switch_value() should be checked
metze
git-svn-id: svn+ssh://svn.samba.org/data/svn/samba/branches/SAMBA_4_0@25779 0c0555d6-39d7-0310-84fc-f1cc0bd64818
(This used to be commit 1563a08cb0
)
This commit is contained in:
parent
ac8cf500d4
commit
0f904f7d2a
@ -723,7 +723,7 @@ NTSTATUS ndr_pull_union_blob(const DATA_BLOB *blob, TALLOC_CTX *mem_ctx, void *p
|
|||||||
struct ndr_pull *ndr;
|
struct ndr_pull *ndr;
|
||||||
ndr = ndr_pull_init_blob(blob, mem_ctx);
|
ndr = ndr_pull_init_blob(blob, mem_ctx);
|
||||||
NT_STATUS_HAVE_NO_MEMORY(ndr);
|
NT_STATUS_HAVE_NO_MEMORY(ndr);
|
||||||
ndr_pull_set_switch_value(ndr, p, level);
|
NDR_CHECK(ndr_pull_set_switch_value(ndr, p, level));
|
||||||
NDR_CHECK(fn(ndr, NDR_SCALARS|NDR_BUFFERS, p));
|
NDR_CHECK(fn(ndr, NDR_SCALARS|NDR_BUFFERS, p));
|
||||||
return NT_STATUS_OK;
|
return NT_STATUS_OK;
|
||||||
}
|
}
|
||||||
@ -738,7 +738,7 @@ _PUBLIC_ NTSTATUS ndr_pull_union_blob_all(const DATA_BLOB *blob, TALLOC_CTX *mem
|
|||||||
struct ndr_pull *ndr;
|
struct ndr_pull *ndr;
|
||||||
ndr = ndr_pull_init_blob(blob, mem_ctx);
|
ndr = ndr_pull_init_blob(blob, mem_ctx);
|
||||||
NT_STATUS_HAVE_NO_MEMORY(ndr);
|
NT_STATUS_HAVE_NO_MEMORY(ndr);
|
||||||
ndr_pull_set_switch_value(ndr, p, level);
|
NDR_CHECK(ndr_pull_set_switch_value(ndr, p, level));
|
||||||
NDR_CHECK(fn(ndr, NDR_SCALARS|NDR_BUFFERS, p));
|
NDR_CHECK(fn(ndr, NDR_SCALARS|NDR_BUFFERS, p));
|
||||||
if (ndr->offset < ndr->data_size) {
|
if (ndr->offset < ndr->data_size) {
|
||||||
return ndr_pull_error(ndr, NDR_ERR_UNREAD_BYTES,
|
return ndr_pull_error(ndr, NDR_ERR_UNREAD_BYTES,
|
||||||
|
Loading…
Reference in New Issue
Block a user