diff options
author | Andrew Bartlett <abartlet@samba.org> | 2021-05-22 09:10:56 +1200 |
---|---|---|
committer | Douglas Bagnall <dbagnall@samba.org> | 2021-06-02 03:56:36 +0000 |
commit | 40aabcb5cf76ff076e04bff00f4ff0b4374f2354 (patch) | |
tree | 90e70c829ee55651d050c603d1198c4755deb6b5 | |
parent | c35f4180a44eb3caecad0f2daab46574bc52be83 (diff) | |
download | samba-40aabcb5cf76ff076e04bff00f4ff0b4374f2354.tar.gz |
librpc: Add const to cookie pointer in ndr_check_array_{size,length}
This pointer is only used to find the right token in the list
so can be declared const.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14710
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
-rw-r--r-- | librpc/ABI/ndr-2.0.0.sigs | 4 | ||||
-rw-r--r-- | librpc/ndr/libndr.h | 4 | ||||
-rw-r--r-- | librpc/ndr/ndr.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/librpc/ABI/ndr-2.0.0.sigs b/librpc/ABI/ndr-2.0.0.sigs index 5089be76f30..017b9b3500d 100644 --- a/librpc/ABI/ndr-2.0.0.sigs +++ b/librpc/ABI/ndr-2.0.0.sigs @@ -16,8 +16,8 @@ _ndr_pull_error: enum ndr_err_code (struct ndr_pull *, enum ndr_err_code, const _ndr_push_error: enum ndr_err_code (struct ndr_push *, enum ndr_err_code, const char *, const char *, const char *, ...) ndr_align_size: size_t (uint32_t, size_t) ndr_charset_length: uint32_t (const void *, charset_t) -ndr_check_array_length: enum ndr_err_code (struct ndr_pull *, void *, uint32_t) -ndr_check_array_size: enum ndr_err_code (struct ndr_pull *, void *, uint32_t) +ndr_check_array_length: enum ndr_err_code (struct ndr_pull *, const void *, uint32_t) +ndr_check_array_size: enum ndr_err_code (struct ndr_pull *, const void *, uint32_t) ndr_check_padding: void (struct ndr_pull *, size_t) ndr_check_pipe_chunk_trailer: enum ndr_err_code (struct ndr_pull *, int, uint32_t) ndr_check_string_terminator: enum ndr_err_code (struct ndr_pull *, uint32_t, uint32_t) diff --git a/librpc/ndr/libndr.h b/librpc/ndr/libndr.h index 4a13a16167c..156f70216c2 100644 --- a/librpc/ndr/libndr.h +++ b/librpc/ndr/libndr.h @@ -656,10 +656,10 @@ enum ndr_err_code ndr_token_retrieve(struct ndr_token_list *list, const void *ke enum ndr_err_code ndr_token_peek(struct ndr_token_list *list, const void *key, uint32_t *v); enum ndr_err_code ndr_pull_array_size(struct ndr_pull *ndr, const void *p); enum ndr_err_code ndr_get_array_size(struct ndr_pull *ndr, const void *p, uint32_t *size); -enum ndr_err_code ndr_check_array_size(struct ndr_pull *ndr, void *p, uint32_t size); +enum ndr_err_code ndr_check_array_size(struct ndr_pull *ndr, const void *p, uint32_t size); enum ndr_err_code ndr_pull_array_length(struct ndr_pull *ndr, const void *p); enum ndr_err_code ndr_get_array_length(struct ndr_pull *ndr, const void *p, uint32_t *length); -enum ndr_err_code ndr_check_array_length(struct ndr_pull *ndr, void *p, uint32_t length); +enum ndr_err_code ndr_check_array_length(struct ndr_pull *ndr, const void *p, uint32_t length); enum ndr_err_code ndr_push_pipe_chunk_trailer(struct ndr_push *ndr, int ndr_flags, uint32_t count); enum ndr_err_code ndr_check_pipe_chunk_trailer(struct ndr_pull *ndr, int ndr_flags, uint32_t count); enum ndr_err_code ndr_push_set_switch_value(struct ndr_push *ndr, const void *p, uint32_t val); diff --git a/librpc/ndr/ndr.c b/librpc/ndr/ndr.c index 115e617da4a..da98317bc0b 100644 --- a/librpc/ndr/ndr.c +++ b/librpc/ndr/ndr.c @@ -1100,7 +1100,7 @@ _PUBLIC_ enum ndr_err_code ndr_get_array_size(struct ndr_pull *ndr, const void * /* check the stored array size field */ -_PUBLIC_ enum ndr_err_code ndr_check_array_size(struct ndr_pull *ndr, void *p, uint32_t size) +_PUBLIC_ enum ndr_err_code ndr_check_array_size(struct ndr_pull *ndr, const void *p, uint32_t size) { uint32_t stored; NDR_CHECK(ndr_token_peek(&ndr->array_size_list, p, &stored)); @@ -1145,7 +1145,7 @@ _PUBLIC_ enum ndr_err_code ndr_get_array_length(struct ndr_pull *ndr, const void /* check the stored array length field */ -_PUBLIC_ enum ndr_err_code ndr_check_array_length(struct ndr_pull *ndr, void *p, uint32_t length) +_PUBLIC_ enum ndr_err_code ndr_check_array_length(struct ndr_pull *ndr, const void *p, uint32_t length) { uint32_t stored; NDR_CHECK(ndr_token_peek(&ndr->array_length_list, p, &stored)); |