diff options
Diffstat (limited to 'librpc/gen_ndr/ndr_xattr.c')
-rw-r--r-- | librpc/gen_ndr/ndr_xattr.c | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/librpc/gen_ndr/ndr_xattr.c b/librpc/gen_ndr/ndr_xattr.c index d217a00228d..a020ea3b255 100644 --- a/librpc/gen_ndr/ndr_xattr.c +++ b/librpc/gen_ndr/ndr_xattr.c @@ -305,6 +305,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_xattr_DosEAs(struct ndr_push *ndr, int ndr_f _PUBLIC_ enum ndr_err_code ndr_pull_xattr_DosEAs(struct ndr_pull *ndr, int ndr_flags, struct xattr_DosEAs *r) { uint32_t _ptr_eas; + uint32_t size_eas_1 = 0; uint32_t cntr_eas_1; TALLOC_CTX *_mem_save_eas_0; TALLOC_CTX *_mem_save_eas_1; @@ -323,10 +324,11 @@ _PUBLIC_ enum ndr_err_code ndr_pull_xattr_DosEAs(struct ndr_pull *ndr, int ndr_f _mem_save_eas_0 = NDR_PULL_GET_MEM_CTX(ndr); NDR_PULL_SET_MEM_CTX(ndr, r->eas, 0); NDR_CHECK(ndr_pull_array_size(ndr, &r->eas)); - NDR_PULL_ALLOC_N(ndr, r->eas, ndr_get_array_size(ndr, &r->eas)); + size_eas_1 = ndr_get_array_size(ndr, &r->eas); + NDR_PULL_ALLOC_N(ndr, r->eas, size_eas_1); _mem_save_eas_1 = NDR_PULL_GET_MEM_CTX(ndr); NDR_PULL_SET_MEM_CTX(ndr, r->eas, 0); - for (cntr_eas_1 = 0; cntr_eas_1 < r->num_eas; cntr_eas_1++) { + for (cntr_eas_1 = 0; cntr_eas_1 < size_eas_1; cntr_eas_1++) { NDR_CHECK(ndr_pull_xattr_EA(ndr, NDR_SCALARS, &r->eas[cntr_eas_1])); } NDR_PULL_SET_MEM_CTX(ndr, _mem_save_eas_1, 0); @@ -380,15 +382,17 @@ _PUBLIC_ enum ndr_err_code ndr_push_tdb_xattrs(struct ndr_push *ndr, int ndr_fla _PUBLIC_ enum ndr_err_code ndr_pull_tdb_xattrs(struct ndr_pull *ndr, int ndr_flags, struct tdb_xattrs *r) { + uint32_t size_eas_0 = 0; uint32_t cntr_eas_0; TALLOC_CTX *_mem_save_eas_0; if (ndr_flags & NDR_SCALARS) { NDR_CHECK(ndr_pull_align(ndr, 4)); NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->num_eas)); - NDR_PULL_ALLOC_N(ndr, r->eas, r->num_eas); + size_eas_0 = r->num_eas; + NDR_PULL_ALLOC_N(ndr, r->eas, size_eas_0); _mem_save_eas_0 = NDR_PULL_GET_MEM_CTX(ndr); NDR_PULL_SET_MEM_CTX(ndr, r->eas, 0); - for (cntr_eas_0 = 0; cntr_eas_0 < r->num_eas; cntr_eas_0++) { + for (cntr_eas_0 = 0; cntr_eas_0 < size_eas_0; cntr_eas_0++) { NDR_CHECK(ndr_pull_xattr_EA(ndr, NDR_SCALARS, &r->eas[cntr_eas_0])); } NDR_PULL_SET_MEM_CTX(ndr, _mem_save_eas_0, 0); @@ -488,6 +492,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_xattr_DosStreams(struct ndr_push *ndr, int n _PUBLIC_ enum ndr_err_code ndr_pull_xattr_DosStreams(struct ndr_pull *ndr, int ndr_flags, struct xattr_DosStreams *r) { uint32_t _ptr_streams; + uint32_t size_streams_1 = 0; uint32_t cntr_streams_1; TALLOC_CTX *_mem_save_streams_0; TALLOC_CTX *_mem_save_streams_1; @@ -506,10 +511,11 @@ _PUBLIC_ enum ndr_err_code ndr_pull_xattr_DosStreams(struct ndr_pull *ndr, int n _mem_save_streams_0 = NDR_PULL_GET_MEM_CTX(ndr); NDR_PULL_SET_MEM_CTX(ndr, r->streams, 0); NDR_CHECK(ndr_pull_array_size(ndr, &r->streams)); - NDR_PULL_ALLOC_N(ndr, r->streams, ndr_get_array_size(ndr, &r->streams)); + size_streams_1 = ndr_get_array_size(ndr, &r->streams); + NDR_PULL_ALLOC_N(ndr, r->streams, size_streams_1); _mem_save_streams_1 = NDR_PULL_GET_MEM_CTX(ndr); NDR_PULL_SET_MEM_CTX(ndr, r->streams, 0); - for (cntr_streams_1 = 0; cntr_streams_1 < r->num_streams; cntr_streams_1++) { + for (cntr_streams_1 = 0; cntr_streams_1 < size_streams_1; cntr_streams_1++) { NDR_CHECK(ndr_pull_xattr_DosStream(ndr, NDR_SCALARS, &r->streams[cntr_streams_1])); } NDR_PULL_SET_MEM_CTX(ndr, _mem_save_streams_1, 0); @@ -565,6 +571,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_security_descriptor_hash(struct ndr_pull *nd { uint32_t _ptr_sd; TALLOC_CTX *_mem_save_sd_0; + uint32_t size_hash_0 = 0; if (ndr_flags & NDR_SCALARS) { NDR_CHECK(ndr_pull_align(ndr, 4)); NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_sd)); @@ -573,7 +580,8 @@ _PUBLIC_ enum ndr_err_code ndr_pull_security_descriptor_hash(struct ndr_pull *nd } else { r->sd = NULL; } - NDR_CHECK(ndr_pull_array_uint8(ndr, NDR_SCALARS, r->hash, 16)); + size_hash_0 = 16; + NDR_CHECK(ndr_pull_array_uint8(ndr, NDR_SCALARS, r->hash, size_hash_0)); } if (ndr_flags & NDR_BUFFERS) { if (r->sd) { @@ -645,7 +653,9 @@ static enum ndr_err_code ndr_pull_xattr_NTACL_Info(struct ndr_pull *ndr, int ndr int level; uint16_t _level; TALLOC_CTX *_mem_save_sd_0; + uint32_t _ptr_sd; TALLOC_CTX *_mem_save_sd_hs_0; + uint32_t _ptr_sd_hs; level = ndr_pull_get_switch_value(ndr, r); if (ndr_flags & NDR_SCALARS) { NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &_level)); @@ -654,7 +664,6 @@ static enum ndr_err_code ndr_pull_xattr_NTACL_Info(struct ndr_pull *ndr, int ndr } switch (level) { case 1: { - uint32_t _ptr_sd; NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_sd)); if (_ptr_sd) { NDR_PULL_ALLOC(ndr, r->sd); @@ -664,7 +673,6 @@ static enum ndr_err_code ndr_pull_xattr_NTACL_Info(struct ndr_pull *ndr, int ndr break; } case 2: { - uint32_t _ptr_sd_hs; NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_sd_hs)); if (_ptr_sd_hs) { NDR_PULL_ALLOC(ndr, r->sd_hs); |