Ignore:
Timestamp:
Nov 12, 2012, 5:18:59 PM (13 years ago)
Author:
Silvan Scherrer
Message:

Samba Server 3.5: update branche to 3.5.14

Location:
branches/samba-3.5.x/source3/librpc/gen_ndr
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • branches/samba-3.5.x/source3/librpc/gen_ndr/ndr_libnetapi.c

    r414 r734  
    4848_PUBLIC_ enum ndr_err_code ndr_pull_domsid(struct ndr_pull *ndr, int ndr_flags, struct domsid *r)
    4949{
     50        uint32_t size_id_auth_0 = 0;
     51        uint32_t size_sub_auths_0 = 0;
    5052        uint32_t cntr_sub_auths_0;
    5153        TALLOC_CTX *_mem_save_sub_auths_0;
     
    5456                NDR_CHECK(ndr_pull_uint8(ndr, NDR_SCALARS, &r->sid_rev_num));
    5557                NDR_CHECK(ndr_pull_uint8(ndr, NDR_SCALARS, &r->num_auths));
    56                 NDR_CHECK(ndr_pull_array_uint8(ndr, NDR_SCALARS, r->id_auth, 6));
    57                 NDR_PULL_ALLOC_N(ndr, r->sub_auths, MAXSUBAUTHS);
     58                size_id_auth_0 = 6;
     59                NDR_CHECK(ndr_pull_array_uint8(ndr, NDR_SCALARS, r->id_auth, size_id_auth_0));
     60                size_sub_auths_0 = MAXSUBAUTHS;
     61                NDR_PULL_ALLOC_N(ndr, r->sub_auths, size_sub_auths_0);
    5862                _mem_save_sub_auths_0 = NDR_PULL_GET_MEM_CTX(ndr);
    5963                NDR_PULL_SET_MEM_CTX(ndr, r->sub_auths, 0);
    60                 for (cntr_sub_auths_0 = 0; cntr_sub_auths_0 < MAXSUBAUTHS; cntr_sub_auths_0++) {
     64                for (cntr_sub_auths_0 = 0; cntr_sub_auths_0 < size_sub_auths_0; cntr_sub_auths_0++) {
    6165                        NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->sub_auths[cntr_sub_auths_0]));
    6266                }
     
    48924896_PUBLIC_ enum ndr_err_code ndr_pull_USER_INFO_21(struct ndr_pull *ndr, int ndr_flags, struct USER_INFO_21 *r)
    48934897{
     4898        uint32_t size_usri21_password_0 = 0;
    48944899        if (ndr_flags & NDR_SCALARS) {
    48954900                NDR_CHECK(ndr_pull_align(ndr, 1));
    4896                 NDR_PULL_ALLOC_N(ndr, r->usri21_password, ENCRYPTED_PWLEN);
    4897                 NDR_CHECK(ndr_pull_array_uint8(ndr, NDR_SCALARS, r->usri21_password, ENCRYPTED_PWLEN));
     4901                size_usri21_password_0 = ENCRYPTED_PWLEN;
     4902                NDR_PULL_ALLOC_N(ndr, r->usri21_password, size_usri21_password_0);
     4903                NDR_CHECK(ndr_pull_array_uint8(ndr, NDR_SCALARS, r->usri21_password, size_usri21_password_0));
    48984904                NDR_CHECK(ndr_pull_trailer_align(ndr, 1));
    48994905        }
     
    49514957_PUBLIC_ enum ndr_err_code ndr_pull_USER_INFO_22(struct ndr_pull *ndr, int ndr_flags, struct USER_INFO_22 *r)
    49524958{
     4959        uint32_t size_usri22_password_0 = 0;
    49534960        uint32_t _ptr_usri22_logon_hours;
    49544961        TALLOC_CTX *_mem_save_usri22_logon_hours_0;
     
    49564963                NDR_CHECK(ndr_pull_align(ndr, 5));
    49574964                NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS, &r->usri22_name));
    4958                 NDR_PULL_ALLOC_N(ndr, r->usri22_password, ENCRYPTED_PWLEN);
    4959                 NDR_CHECK(ndr_pull_array_uint8(ndr, NDR_SCALARS, r->usri22_password, ENCRYPTED_PWLEN));
     4965                size_usri22_password_0 = ENCRYPTED_PWLEN;
     4966                NDR_PULL_ALLOC_N(ndr, r->usri22_password, size_usri22_password_0);
     4967                NDR_CHECK(ndr_pull_array_uint8(ndr, NDR_SCALARS, r->usri22_password, size_usri22_password_0));
    49604968                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->usri22_password_age));
    49614969                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->usri22_priv));
  • branches/samba-3.5.x/source3/librpc/gen_ndr/ndr_messaging.c

    r429 r734  
    149149_PUBLIC_ enum ndr_err_code ndr_pull_messaging_array(struct ndr_pull *ndr, int ndr_flags, struct messaging_array *r)
    150150{
     151        uint32_t size_messages_0 = 0;
    151152        uint32_t cntr_messages_0;
    152153        TALLOC_CTX *_mem_save_messages_0;
     
    154155                NDR_CHECK(ndr_pull_align(ndr, 4));
    155156                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->num_messages));
    156                 NDR_PULL_ALLOC_N(ndr, r->messages, r->num_messages);
     157                size_messages_0 = r->num_messages;
     158                NDR_PULL_ALLOC_N(ndr, r->messages, size_messages_0);
    157159                _mem_save_messages_0 = NDR_PULL_GET_MEM_CTX(ndr);
    158160                NDR_PULL_SET_MEM_CTX(ndr, r->messages, 0);
    159                 for (cntr_messages_0 = 0; cntr_messages_0 < r->num_messages; cntr_messages_0++) {
     161                for (cntr_messages_0 = 0; cntr_messages_0 < size_messages_0; cntr_messages_0++) {
    160162                        NDR_CHECK(ndr_pull_messaging_rec(ndr, NDR_SCALARS, &r->messages[cntr_messages_0]));
    161163                }
     
    164166        }
    165167        if (ndr_flags & NDR_BUFFERS) {
     168                size_messages_0 = r->num_messages;
    166169                _mem_save_messages_0 = NDR_PULL_GET_MEM_CTX(ndr);
    167170                NDR_PULL_SET_MEM_CTX(ndr, r->messages, 0);
    168                 for (cntr_messages_0 = 0; cntr_messages_0 < r->num_messages; cntr_messages_0++) {
     171                for (cntr_messages_0 = 0; cntr_messages_0 < size_messages_0; cntr_messages_0++) {
    169172                        NDR_CHECK(ndr_pull_messaging_rec(ndr, NDR_BUFFERS, &r->messages[cntr_messages_0]));
    170173                }
     
    220223_PUBLIC_ enum ndr_err_code ndr_pull_dbwrap_tdb2_changes(struct ndr_pull *ndr, int ndr_flags, struct dbwrap_tdb2_changes *r)
    221224{
     225        uint32_t size_magic_string_0 = 0;
     226        uint32_t size_name_0 = 0;
     227        uint32_t length_name_0 = 0;
     228        uint32_t size_keys_0 = 0;
    222229        uint32_t cntr_keys_0;
    223230        TALLOC_CTX *_mem_save_keys_0;
    224231        if (ndr_flags & NDR_SCALARS) {
    225232                NDR_CHECK(ndr_pull_align(ndr, 4));
    226                 NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->magic_string, 4, sizeof(uint8_t), CH_DOS));
     233                size_magic_string_0 = 4;
     234                NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->magic_string, size_magic_string_0, sizeof(uint8_t), CH_DOS));
    227235                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->magic_version));
    228236                NDR_CHECK(ndr_pull_array_size(ndr, &r->name));
    229237                NDR_CHECK(ndr_pull_array_length(ndr, &r->name));
    230                 if (ndr_get_array_length(ndr, &r->name) > ndr_get_array_size(ndr, &r->name)) {
    231                         return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE, "Bad array size %u should exceed array length %u", ndr_get_array_size(ndr, &r->name), ndr_get_array_length(ndr, &r->name));
    232                 }
    233                 NDR_CHECK(ndr_check_string_terminator(ndr, ndr_get_array_length(ndr, &r->name), sizeof(uint8_t)));
    234                 NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->name, ndr_get_array_length(ndr, &r->name), sizeof(uint8_t), CH_UTF8));
     238                size_name_0 = ndr_get_array_size(ndr, &r->name);
     239                length_name_0 = ndr_get_array_length(ndr, &r->name);
     240                if (length_name_0 > size_name_0) {
     241                        return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE, "Bad array size %u should exceed array length %u", size_name_0, length_name_0);
     242                }
     243                NDR_CHECK(ndr_check_string_terminator(ndr, length_name_0, sizeof(uint8_t)));
     244                NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->name, length_name_0, sizeof(uint8_t), CH_UTF8));
    235245                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->old_seqnum));
    236246                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->new_seqnum));
    237247                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->num_changes));
    238248                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->num_keys));
    239                 NDR_PULL_ALLOC_N(ndr, r->keys, r->num_keys);
     249                size_keys_0 = r->num_keys;
     250                NDR_PULL_ALLOC_N(ndr, r->keys, size_keys_0);
    240251                _mem_save_keys_0 = NDR_PULL_GET_MEM_CTX(ndr);
    241252                NDR_PULL_SET_MEM_CTX(ndr, r->keys, 0);
    242                 for (cntr_keys_0 = 0; cntr_keys_0 < r->num_keys; cntr_keys_0++) {
     253                for (cntr_keys_0 = 0; cntr_keys_0 < size_keys_0; cntr_keys_0++) {
    243254                        NDR_CHECK(ndr_pull_DATA_BLOB(ndr, NDR_SCALARS, &r->keys[cntr_keys_0]));
    244255                }
  • branches/samba-3.5.x/source3/librpc/gen_ndr/ndr_notify.c

    r414 r734  
    9292_PUBLIC_ enum ndr_err_code ndr_pull_notify_entry_array(struct ndr_pull *ndr, int ndr_flags, struct notify_entry_array *r)
    9393{
     94        uint32_t size_entries_0 = 0;
    9495        uint32_t cntr_entries_0;
    9596        TALLOC_CTX *_mem_save_entries_0;
     
    9798                NDR_CHECK(ndr_pull_align(ndr, 8));
    9899                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->num_entries));
    99                 NDR_PULL_ALLOC_N(ndr, r->entries, r->num_entries);
     100                size_entries_0 = r->num_entries;
     101                NDR_PULL_ALLOC_N(ndr, r->entries, size_entries_0);
    100102                _mem_save_entries_0 = NDR_PULL_GET_MEM_CTX(ndr);
    101103                NDR_PULL_SET_MEM_CTX(ndr, r->entries, 0);
    102                 for (cntr_entries_0 = 0; cntr_entries_0 < r->num_entries; cntr_entries_0++) {
     104                for (cntr_entries_0 = 0; cntr_entries_0 < size_entries_0; cntr_entries_0++) {
    103105                        NDR_CHECK(ndr_pull_notify_entry(ndr, NDR_SCALARS, &r->entries[cntr_entries_0]));
    104106                }
     
    107109        }
    108110        if (ndr_flags & NDR_BUFFERS) {
     111                size_entries_0 = r->num_entries;
    109112                _mem_save_entries_0 = NDR_PULL_GET_MEM_CTX(ndr);
    110113                NDR_PULL_SET_MEM_CTX(ndr, r->entries, 0);
    111                 for (cntr_entries_0 = 0; cntr_entries_0 < r->num_entries; cntr_entries_0++) {
     114                for (cntr_entries_0 = 0; cntr_entries_0 < size_entries_0; cntr_entries_0++) {
    112115                        NDR_CHECK(ndr_pull_notify_entry(ndr, NDR_BUFFERS, &r->entries[cntr_entries_0]));
    113116                }
     
    159162static enum ndr_err_code ndr_pull_notify_depth(struct ndr_pull *ndr, int ndr_flags, struct notify_depth *r)
    160163{
     164        uint32_t size_entries_0 = 0;
    161165        uint32_t cntr_entries_0;
    162166        TALLOC_CTX *_mem_save_entries_0;
     
    166170                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->max_mask_subdir));
    167171                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->num_entries));
    168                 NDR_PULL_ALLOC_N(ndr, r->entries, r->num_entries);
     172                size_entries_0 = r->num_entries;
     173                NDR_PULL_ALLOC_N(ndr, r->entries, size_entries_0);
    169174                _mem_save_entries_0 = NDR_PULL_GET_MEM_CTX(ndr);
    170175                NDR_PULL_SET_MEM_CTX(ndr, r->entries, 0);
    171                 for (cntr_entries_0 = 0; cntr_entries_0 < r->num_entries; cntr_entries_0++) {
     176                for (cntr_entries_0 = 0; cntr_entries_0 < size_entries_0; cntr_entries_0++) {
    172177                        NDR_CHECK(ndr_pull_notify_entry(ndr, NDR_SCALARS, &r->entries[cntr_entries_0]));
    173178                }
     
    176181        }
    177182        if (ndr_flags & NDR_BUFFERS) {
     183                size_entries_0 = r->num_entries;
    178184                _mem_save_entries_0 = NDR_PULL_GET_MEM_CTX(ndr);
    179185                NDR_PULL_SET_MEM_CTX(ndr, r->entries, 0);
    180                 for (cntr_entries_0 = 0; cntr_entries_0 < r->num_entries; cntr_entries_0++) {
     186                for (cntr_entries_0 = 0; cntr_entries_0 < size_entries_0; cntr_entries_0++) {
    181187                        NDR_CHECK(ndr_pull_notify_entry(ndr, NDR_BUFFERS, &r->entries[cntr_entries_0]));
    182188                }
     
    228234_PUBLIC_ enum ndr_err_code ndr_pull_notify_array(struct ndr_pull *ndr, int ndr_flags, struct notify_array *r)
    229235{
     236        uint32_t size_depth_0 = 0;
    230237        uint32_t cntr_depth_0;
    231238        TALLOC_CTX *_mem_save_depth_0;
     
    233240                NDR_CHECK(ndr_pull_align(ndr, 8));
    234241                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->num_depths));
    235                 NDR_PULL_ALLOC_N(ndr, r->depth, r->num_depths);
     242                size_depth_0 = r->num_depths;
     243                NDR_PULL_ALLOC_N(ndr, r->depth, size_depth_0);
    236244                _mem_save_depth_0 = NDR_PULL_GET_MEM_CTX(ndr);
    237245                NDR_PULL_SET_MEM_CTX(ndr, r->depth, 0);
    238                 for (cntr_depth_0 = 0; cntr_depth_0 < r->num_depths; cntr_depth_0++) {
     246                for (cntr_depth_0 = 0; cntr_depth_0 < size_depth_0; cntr_depth_0++) {
    239247                        NDR_CHECK(ndr_pull_notify_depth(ndr, NDR_SCALARS, &r->depth[cntr_depth_0]));
    240248                }
     
    243251        }
    244252        if (ndr_flags & NDR_BUFFERS) {
     253                size_depth_0 = r->num_depths;
    245254                _mem_save_depth_0 = NDR_PULL_GET_MEM_CTX(ndr);
    246255                NDR_PULL_SET_MEM_CTX(ndr, r->depth, 0);
    247                 for (cntr_depth_0 = 0; cntr_depth_0 < r->num_depths; cntr_depth_0++) {
     256                for (cntr_depth_0 = 0; cntr_depth_0 < size_depth_0; cntr_depth_0++) {
    248257                        NDR_CHECK(ndr_pull_notify_depth(ndr, NDR_BUFFERS, &r->depth[cntr_depth_0]));
    249258                }
  • branches/samba-3.5.x/source3/librpc/gen_ndr/ndr_perfcount.c

    r414 r734  
    131131_PUBLIC_ enum ndr_err_code ndr_pull_PERF_COUNTER_BLOCK(struct ndr_pull *ndr, int ndr_flags, struct PERF_COUNTER_BLOCK *r)
    132132{
     133        uint32_t size_data_0 = 0;
    133134        if (ndr_flags & NDR_SCALARS) {
    134135                NDR_CHECK(ndr_pull_align(ndr, 4));
    135136                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->ByteLength));
    136                 NDR_PULL_ALLOC_N(ndr, r->data, r->ByteLength);
    137                 NDR_CHECK(ndr_pull_array_uint8(ndr, NDR_SCALARS, r->data, r->ByteLength));
     137                size_data_0 = r->ByteLength;
     138                NDR_PULL_ALLOC_N(ndr, r->data, size_data_0);
     139                NDR_CHECK(ndr_pull_array_uint8(ndr, NDR_SCALARS, r->data, size_data_0));
    138140                NDR_CHECK(ndr_pull_trailer_align(ndr, 4));
    139141        }
     
    265267_PUBLIC_ enum ndr_err_code ndr_pull_PERF_OBJECT_TYPE(struct ndr_pull *ndr, int ndr_flags, struct PERF_OBJECT_TYPE *r)
    266268{
     269        uint32_t size_counters_0 = 0;
    267270        uint32_t cntr_counters_0;
    268271        TALLOC_CTX *_mem_save_counters_0;
     272        uint32_t size_instances_0 = 0;
    269273        uint32_t cntr_instances_0;
    270274        TALLOC_CTX *_mem_save_instances_0;
     
    285289                NDR_CHECK(ndr_pull_hyper(ndr, NDR_SCALARS, &r->PerfTime));
    286290                NDR_CHECK(ndr_pull_hyper(ndr, NDR_SCALARS, &r->PerfFreq));
    287                 NDR_PULL_ALLOC_N(ndr, r->counters, r->NumCounters);
     291                size_counters_0 = r->NumCounters;
     292                NDR_PULL_ALLOC_N(ndr, r->counters, size_counters_0);
    288293                _mem_save_counters_0 = NDR_PULL_GET_MEM_CTX(ndr);
    289294                NDR_PULL_SET_MEM_CTX(ndr, r->counters, 0);
    290                 for (cntr_counters_0 = 0; cntr_counters_0 < r->NumCounters; cntr_counters_0++) {
     295                for (cntr_counters_0 = 0; cntr_counters_0 < size_counters_0; cntr_counters_0++) {
    291296                        NDR_CHECK(ndr_pull_PERF_COUNTER_DEFINITION(ndr, NDR_SCALARS, &r->counters[cntr_counters_0]));
    292297                }
    293298                NDR_PULL_SET_MEM_CTX(ndr, _mem_save_counters_0, 0);
    294                 NDR_PULL_ALLOC_N(ndr, r->instances, r->NumInstances);
     299                size_instances_0 = r->NumInstances;
     300                NDR_PULL_ALLOC_N(ndr, r->instances, size_instances_0);
    295301                _mem_save_instances_0 = NDR_PULL_GET_MEM_CTX(ndr);
    296302                NDR_PULL_SET_MEM_CTX(ndr, r->instances, 0);
    297                 for (cntr_instances_0 = 0; cntr_instances_0 < r->NumInstances; cntr_instances_0++) {
     303                for (cntr_instances_0 = 0; cntr_instances_0 < size_instances_0; cntr_instances_0++) {
    298304                        NDR_CHECK(ndr_pull_PERF_INSTANCE_DEFINITION(ndr, NDR_SCALARS, &r->instances[cntr_instances_0]));
    299305                }
     
    303309        }
    304310        if (ndr_flags & NDR_BUFFERS) {
     311                size_instances_0 = r->NumInstances;
    305312                _mem_save_instances_0 = NDR_PULL_GET_MEM_CTX(ndr);
    306313                NDR_PULL_SET_MEM_CTX(ndr, r->instances, 0);
    307                 for (cntr_instances_0 = 0; cntr_instances_0 < r->NumInstances; cntr_instances_0++) {
     314                for (cntr_instances_0 = 0; cntr_instances_0 < size_instances_0; cntr_instances_0++) {
    308315                        NDR_CHECK(ndr_pull_PERF_INSTANCE_DEFINITION(ndr, NDR_BUFFERS, &r->instances[cntr_instances_0]));
    309316                }
     
    399406_PUBLIC_ enum ndr_err_code ndr_pull_PERF_DATA_BLOCK(struct ndr_pull *ndr, int ndr_flags, struct PERF_DATA_BLOCK *r)
    400407{
     408        uint32_t size_Signature_0 = 0;
    401409        uint32_t cntr_Signature_0;
    402410        uint32_t _ptr_data;
    403411        TALLOC_CTX *_mem_save_data_0;
     412        uint32_t size_objects_0 = 0;
    404413        uint32_t cntr_objects_0;
    405414        TALLOC_CTX *_mem_save_objects_0;
    406415        if (ndr_flags & NDR_SCALARS) {
    407416                NDR_CHECK(ndr_pull_align(ndr, 8));
    408                 for (cntr_Signature_0 = 0; cntr_Signature_0 < 4; cntr_Signature_0++) {
     417                size_Signature_0 = 4;
     418                for (cntr_Signature_0 = 0; cntr_Signature_0 < size_Signature_0; cntr_Signature_0++) {
    409419                        NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->Signature[cntr_Signature_0]));
    410420                }
     
    429439                        r->data = NULL;
    430440                }
    431                 NDR_PULL_ALLOC_N(ndr, r->objects, r->NumObjectTypes);
     441                size_objects_0 = r->NumObjectTypes;
     442                NDR_PULL_ALLOC_N(ndr, r->objects, size_objects_0);
    432443                _mem_save_objects_0 = NDR_PULL_GET_MEM_CTX(ndr);
    433444                NDR_PULL_SET_MEM_CTX(ndr, r->objects, 0);
    434                 for (cntr_objects_0 = 0; cntr_objects_0 < r->NumObjectTypes; cntr_objects_0++) {
     445                for (cntr_objects_0 = 0; cntr_objects_0 < size_objects_0; cntr_objects_0++) {
    435446                        NDR_CHECK(ndr_pull_PERF_OBJECT_TYPE(ndr, NDR_SCALARS, &r->objects[cntr_objects_0]));
    436447                }
     
    445456                        NDR_PULL_SET_MEM_CTX(ndr, _mem_save_data_0, 0);
    446457                }
     458                size_objects_0 = r->NumObjectTypes;
    447459                _mem_save_objects_0 = NDR_PULL_GET_MEM_CTX(ndr);
    448460                NDR_PULL_SET_MEM_CTX(ndr, r->objects, 0);
    449                 for (cntr_objects_0 = 0; cntr_objects_0 < r->NumObjectTypes; cntr_objects_0++) {
     461                for (cntr_objects_0 = 0; cntr_objects_0 < size_objects_0; cntr_objects_0++) {
    450462                        NDR_CHECK(ndr_pull_PERF_OBJECT_TYPE(ndr, NDR_BUFFERS, &r->objects[cntr_objects_0]));
    451463                }
  • branches/samba-3.5.x/source3/librpc/gen_ndr/ndr_printcap.c

    r603 r734  
    77{
    88        if (ndr_flags & NDR_SCALARS) {
    9                 NDR_CHECK(ndr_push_align(ndr, 4));
     9                NDR_CHECK(ndr_push_align(ndr, 5));
    1010                NDR_CHECK(ndr_push_unique_ptr(ndr, r->name));
    1111                NDR_CHECK(ndr_push_unique_ptr(ndr, r->info));
     12                NDR_CHECK(ndr_push_trailer_align(ndr, 5));
    1213        }
    1314        if (ndr_flags & NDR_BUFFERS) {
    1415                if (r->name) {
    15                         NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->name, CH_UTF8)));
    16                         NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
    17                         NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->name, CH_UTF8)));
     16                        NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->name, CH_UTF8)));
     17                        NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, 0));
     18                        NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->name, CH_UTF8)));
    1819                        NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->name, ndr_charset_length(r->name, CH_UTF8), sizeof(uint8_t), CH_UTF8));
    1920                }
    2021                if (r->info) {
    21                         NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->info, CH_UTF8)));
    22                         NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
    23                         NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->info, CH_UTF8)));
     22                        NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->info, CH_UTF8)));
     23                        NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, 0));
     24                        NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->info, CH_UTF8)));
    2425                        NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->info, ndr_charset_length(r->info, CH_UTF8), sizeof(uint8_t), CH_UTF8));
    2526                }
     
    3132{
    3233        uint32_t _ptr_name;
     34        uint32_t size_name_1 = 0;
     35        uint32_t length_name_1 = 0;
    3336        TALLOC_CTX *_mem_save_name_0;
    3437        uint32_t _ptr_info;
     38        uint32_t size_info_1 = 0;
     39        uint32_t length_info_1 = 0;
    3540        TALLOC_CTX *_mem_save_info_0;
    3641        if (ndr_flags & NDR_SCALARS) {
    37                 NDR_CHECK(ndr_pull_align(ndr, 4));
     42                NDR_CHECK(ndr_pull_align(ndr, 5));
    3843                NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_name));
    3944                if (_ptr_name) {
     
    4853                        r->info = NULL;
    4954                }
     55                NDR_CHECK(ndr_pull_trailer_align(ndr, 5));
    5056        }
    5157        if (ndr_flags & NDR_BUFFERS) {
     
    5561                        NDR_CHECK(ndr_pull_array_size(ndr, &r->name));
    5662                        NDR_CHECK(ndr_pull_array_length(ndr, &r->name));
    57                         if (ndr_get_array_length(ndr, &r->name) > ndr_get_array_size(ndr, &r->name)) {
    58                                 return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE, "Bad array size %u should exceed array length %u", ndr_get_array_size(ndr, &r->name), ndr_get_array_length(ndr, &r->name));
     63                        size_name_1 = ndr_get_array_size(ndr, &r->name);
     64                        length_name_1 = ndr_get_array_length(ndr, &r->name);
     65                        if (length_name_1 > size_name_1) {
     66                                return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE, "Bad array size %u should exceed array length %u", size_name_1, length_name_1);
    5967                        }
    60                         NDR_CHECK(ndr_check_string_terminator(ndr, ndr_get_array_length(ndr, &r->name), sizeof(uint8_t)));
    61                         NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->name, ndr_get_array_length(ndr, &r->name), sizeof(uint8_t), CH_UTF8));
     68                        NDR_CHECK(ndr_check_string_terminator(ndr, length_name_1, sizeof(uint8_t)));
     69                        NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->name, length_name_1, sizeof(uint8_t), CH_UTF8));
    6270                        NDR_PULL_SET_MEM_CTX(ndr, _mem_save_name_0, 0);
    6371                }
     
    6775                        NDR_CHECK(ndr_pull_array_size(ndr, &r->info));
    6876                        NDR_CHECK(ndr_pull_array_length(ndr, &r->info));
    69                         if (ndr_get_array_length(ndr, &r->info) > ndr_get_array_size(ndr, &r->info)) {
    70                                 return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE, "Bad array size %u should exceed array length %u", ndr_get_array_size(ndr, &r->info), ndr_get_array_length(ndr, &r->info));
     77                        size_info_1 = ndr_get_array_size(ndr, &r->info);
     78                        length_info_1 = ndr_get_array_length(ndr, &r->info);
     79                        if (length_info_1 > size_info_1) {
     80                                return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE, "Bad array size %u should exceed array length %u", size_info_1, length_info_1);
    7181                        }
    72                         NDR_CHECK(ndr_check_string_terminator(ndr, ndr_get_array_length(ndr, &r->info), sizeof(uint8_t)));
    73                         NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->info, ndr_get_array_length(ndr, &r->info), sizeof(uint8_t), CH_UTF8));
     82                        NDR_CHECK(ndr_check_string_terminator(ndr, length_info_1, sizeof(uint8_t)));
     83                        NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->info, length_info_1, sizeof(uint8_t), CH_UTF8));
    7484                        NDR_PULL_SET_MEM_CTX(ndr, _mem_save_info_0, 0);
    7585                }
     
    101111        uint32_t cntr_printers_0;
    102112        if (ndr_flags & NDR_SCALARS) {
    103                 NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->count));
    104                 NDR_CHECK(ndr_push_align(ndr, 4));
     113                NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, r->count));
     114                NDR_CHECK(ndr_push_align(ndr, 5));
    105115                NDR_CHECK(ndr_push_NTSTATUS(ndr, NDR_SCALARS, r->status));
    106116                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->count));
     
    108118                        NDR_CHECK(ndr_push_pcap_printer(ndr, NDR_SCALARS, &r->printers[cntr_printers_0]));
    109119                }
     120                NDR_CHECK(ndr_push_trailer_align(ndr, 5));
    110121        }
    111122        if (ndr_flags & NDR_BUFFERS) {
     
    119130_PUBLIC_ enum ndr_err_code ndr_pull_pcap_data(struct ndr_pull *ndr, int ndr_flags, struct pcap_data *r)
    120131{
     132        uint32_t size_printers_0 = 0;
    121133        uint32_t cntr_printers_0;
    122134        TALLOC_CTX *_mem_save_printers_0;
    123135        if (ndr_flags & NDR_SCALARS) {
    124136                NDR_CHECK(ndr_pull_array_size(ndr, &r->printers));
    125                 NDR_CHECK(ndr_pull_align(ndr, 4));
     137                NDR_CHECK(ndr_pull_align(ndr, 5));
    126138                NDR_CHECK(ndr_pull_NTSTATUS(ndr, NDR_SCALARS, &r->status));
    127139                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->count));
    128                 NDR_PULL_ALLOC_N(ndr, r->printers, ndr_get_array_size(ndr, &r->printers));
     140                size_printers_0 = ndr_get_array_size(ndr, &r->printers);
     141                NDR_PULL_ALLOC_N(ndr, r->printers, size_printers_0);
    129142                _mem_save_printers_0 = NDR_PULL_GET_MEM_CTX(ndr);
    130143                NDR_PULL_SET_MEM_CTX(ndr, r->printers, 0);
    131                 for (cntr_printers_0 = 0; cntr_printers_0 < r->count; cntr_printers_0++) {
     144                for (cntr_printers_0 = 0; cntr_printers_0 < size_printers_0; cntr_printers_0++) {
    132145                        NDR_CHECK(ndr_pull_pcap_printer(ndr, NDR_SCALARS, &r->printers[cntr_printers_0]));
    133146                }
     
    136149                        NDR_CHECK(ndr_check_array_size(ndr, (void*)&r->printers, r->count));
    137150                }
     151                NDR_CHECK(ndr_pull_trailer_align(ndr, 5));
    138152        }
    139153        if (ndr_flags & NDR_BUFFERS) {
     154                size_printers_0 = ndr_get_array_size(ndr, &r->printers);
    140155                _mem_save_printers_0 = NDR_PULL_GET_MEM_CTX(ndr);
    141156                NDR_PULL_SET_MEM_CTX(ndr, r->printers, 0);
    142                 for (cntr_printers_0 = 0; cntr_printers_0 < r->count; cntr_printers_0++) {
     157                for (cntr_printers_0 = 0; cntr_printers_0 < size_printers_0; cntr_printers_0++) {
    143158                        NDR_CHECK(ndr_pull_pcap_printer(ndr, NDR_BUFFERS, &r->printers[cntr_printers_0]));
    144159                }
  • branches/samba-3.5.x/source3/librpc/gen_ndr/ndr_secrets.c

    r596 r734  
    3333_PUBLIC_ enum ndr_err_code ndr_pull_TRUSTED_DOM_PASS(struct ndr_pull *ndr, int ndr_flags, struct TRUSTED_DOM_PASS *r)
    3434{
     35        uint32_t size_uni_name_0 = 0;
    3536        {
    3637                uint32_t _flags_save_STRUCT = ndr->flags;
     
    3940                        NDR_CHECK(ndr_pull_align(ndr, 4));
    4041                        NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->uni_name_len));
    41                         NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->uni_name, 32, sizeof(uint16_t), CH_UTF16));
     42                        size_uni_name_0 = 32;
     43                        NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->uni_name, size_uni_name_0, sizeof(uint16_t), CH_UTF16));
    4244                        NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->pass_len));
    4345                        {
  • branches/samba-3.5.x/source3/librpc/gen_ndr/ndr_wbint.c

    r620 r734  
    5151{
    5252        uint32_t _ptr_acct_name;
     53        uint32_t size_acct_name_1 = 0;
     54        uint32_t length_acct_name_1 = 0;
    5355        TALLOC_CTX *_mem_save_acct_name_0;
    5456        uint32_t _ptr_full_name;
     57        uint32_t size_full_name_1 = 0;
     58        uint32_t length_full_name_1 = 0;
    5559        TALLOC_CTX *_mem_save_full_name_0;
    5660        uint32_t _ptr_homedir;
     61        uint32_t size_homedir_1 = 0;
     62        uint32_t length_homedir_1 = 0;
    5763        TALLOC_CTX *_mem_save_homedir_0;
    5864        uint32_t _ptr_shell;
     65        uint32_t size_shell_1 = 0;
     66        uint32_t length_shell_1 = 0;
    5967        TALLOC_CTX *_mem_save_shell_0;
    6068        if (ndr_flags & NDR_SCALARS) {
     
    95103                        NDR_CHECK(ndr_pull_array_size(ndr, &r->acct_name));
    96104                        NDR_CHECK(ndr_pull_array_length(ndr, &r->acct_name));
    97                         if (ndr_get_array_length(ndr, &r->acct_name) > ndr_get_array_size(ndr, &r->acct_name)) {
    98                                 return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE, "Bad array size %u should exceed array length %u", ndr_get_array_size(ndr, &r->acct_name), ndr_get_array_length(ndr, &r->acct_name));
     105                        size_acct_name_1 = ndr_get_array_size(ndr, &r->acct_name);
     106                        length_acct_name_1 = ndr_get_array_length(ndr, &r->acct_name);
     107                        if (length_acct_name_1 > size_acct_name_1) {
     108                                return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE, "Bad array size %u should exceed array length %u", size_acct_name_1, length_acct_name_1);
    99109                        }
    100                         NDR_CHECK(ndr_check_string_terminator(ndr, ndr_get_array_length(ndr, &r->acct_name), sizeof(uint8_t)));
    101                         NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->acct_name, ndr_get_array_length(ndr, &r->acct_name), sizeof(uint8_t), CH_UTF8));
     110                        NDR_CHECK(ndr_check_string_terminator(ndr, length_acct_name_1, sizeof(uint8_t)));
     111                        NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->acct_name, length_acct_name_1, sizeof(uint8_t), CH_UTF8));
    102112                        NDR_PULL_SET_MEM_CTX(ndr, _mem_save_acct_name_0, 0);
    103113                }
     
    107117                        NDR_CHECK(ndr_pull_array_size(ndr, &r->full_name));
    108118                        NDR_CHECK(ndr_pull_array_length(ndr, &r->full_name));
    109                         if (ndr_get_array_length(ndr, &r->full_name) > ndr_get_array_size(ndr, &r->full_name)) {
    110                                 return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE, "Bad array size %u should exceed array length %u", ndr_get_array_size(ndr, &r->full_name), ndr_get_array_length(ndr, &r->full_name));
     119                        size_full_name_1 = ndr_get_array_size(ndr, &r->full_name);
     120                        length_full_name_1 = ndr_get_array_length(ndr, &r->full_name);
     121                        if (length_full_name_1 > size_full_name_1) {
     122                                return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE, "Bad array size %u should exceed array length %u", size_full_name_1, length_full_name_1);
    111123                        }
    112                         NDR_CHECK(ndr_check_string_terminator(ndr, ndr_get_array_length(ndr, &r->full_name), sizeof(uint8_t)));
    113                         NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->full_name, ndr_get_array_length(ndr, &r->full_name), sizeof(uint8_t), CH_UTF8));
     124                        NDR_CHECK(ndr_check_string_terminator(ndr, length_full_name_1, sizeof(uint8_t)));
     125                        NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->full_name, length_full_name_1, sizeof(uint8_t), CH_UTF8));
    114126                        NDR_PULL_SET_MEM_CTX(ndr, _mem_save_full_name_0, 0);
    115127                }
     
    119131                        NDR_CHECK(ndr_pull_array_size(ndr, &r->homedir));
    120132                        NDR_CHECK(ndr_pull_array_length(ndr, &r->homedir));
    121                         if (ndr_get_array_length(ndr, &r->homedir) > ndr_get_array_size(ndr, &r->homedir)) {
    122                                 return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE, "Bad array size %u should exceed array length %u", ndr_get_array_size(ndr, &r->homedir), ndr_get_array_length(ndr, &r->homedir));
     133                        size_homedir_1 = ndr_get_array_size(ndr, &r->homedir);
     134                        length_homedir_1 = ndr_get_array_length(ndr, &r->homedir);
     135                        if (length_homedir_1 > size_homedir_1) {
     136                                return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE, "Bad array size %u should exceed array length %u", size_homedir_1, length_homedir_1);
    123137                        }
    124                         NDR_CHECK(ndr_check_string_terminator(ndr, ndr_get_array_length(ndr, &r->homedir), sizeof(uint8_t)));
    125                         NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->homedir, ndr_get_array_length(ndr, &r->homedir), sizeof(uint8_t), CH_UTF8));
     138                        NDR_CHECK(ndr_check_string_terminator(ndr, length_homedir_1, sizeof(uint8_t)));
     139                        NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->homedir, length_homedir_1, sizeof(uint8_t), CH_UTF8));
    126140                        NDR_PULL_SET_MEM_CTX(ndr, _mem_save_homedir_0, 0);
    127141                }
     
    131145                        NDR_CHECK(ndr_pull_array_size(ndr, &r->shell));
    132146                        NDR_CHECK(ndr_pull_array_length(ndr, &r->shell));
    133                         if (ndr_get_array_length(ndr, &r->shell) > ndr_get_array_size(ndr, &r->shell)) {
    134                                 return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE, "Bad array size %u should exceed array length %u", ndr_get_array_size(ndr, &r->shell), ndr_get_array_length(ndr, &r->shell));
     147                        size_shell_1 = ndr_get_array_size(ndr, &r->shell);
     148                        length_shell_1 = ndr_get_array_length(ndr, &r->shell);
     149                        if (length_shell_1 > size_shell_1) {
     150                                return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE, "Bad array size %u should exceed array length %u", size_shell_1, length_shell_1);
    135151                        }
    136                         NDR_CHECK(ndr_check_string_terminator(ndr, ndr_get_array_length(ndr, &r->shell), sizeof(uint8_t)));
    137                         NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->shell, ndr_get_array_length(ndr, &r->shell), sizeof(uint8_t), CH_UTF8));
     152                        NDR_CHECK(ndr_check_string_terminator(ndr, length_shell_1, sizeof(uint8_t)));
     153                        NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->shell, length_shell_1, sizeof(uint8_t), CH_UTF8));
    138154                        NDR_PULL_SET_MEM_CTX(ndr, _mem_save_shell_0, 0);
    139155                }
     
    195211_PUBLIC_ enum ndr_err_code ndr_pull_wbint_SidArray(struct ndr_pull *ndr, int ndr_flags, struct wbint_SidArray *r)
    196212{
     213        uint32_t size_sids_0 = 0;
    197214        uint32_t cntr_sids_0;
    198215        TALLOC_CTX *_mem_save_sids_0;
     
    201218                NDR_CHECK(ndr_pull_align(ndr, 4));
    202219                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->num_sids));
    203                 NDR_PULL_ALLOC_N(ndr, r->sids, ndr_get_array_size(ndr, &r->sids));
     220                size_sids_0 = ndr_get_array_size(ndr, &r->sids);
     221                NDR_PULL_ALLOC_N(ndr, r->sids, size_sids_0);
    204222                _mem_save_sids_0 = NDR_PULL_GET_MEM_CTX(ndr);
    205223                NDR_PULL_SET_MEM_CTX(ndr, r->sids, 0);
    206                 for (cntr_sids_0 = 0; cntr_sids_0 < r->num_sids; cntr_sids_0++) {
     224                for (cntr_sids_0 = 0; cntr_sids_0 < size_sids_0; cntr_sids_0++) {
    207225                        NDR_CHECK(ndr_pull_dom_sid(ndr, NDR_SCALARS, &r->sids[cntr_sids_0]));
    208226                }
     
    256274_PUBLIC_ enum ndr_err_code ndr_pull_wbint_RidArray(struct ndr_pull *ndr, int ndr_flags, struct wbint_RidArray *r)
    257275{
     276        uint32_t size_rids_0 = 0;
    258277        uint32_t cntr_rids_0;
    259278        TALLOC_CTX *_mem_save_rids_0;
     
    262281                NDR_CHECK(ndr_pull_align(ndr, 4));
    263282                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->num_rids));
    264                 NDR_PULL_ALLOC_N(ndr, r->rids, ndr_get_array_size(ndr, &r->rids));
     283                size_rids_0 = ndr_get_array_size(ndr, &r->rids);
     284                NDR_PULL_ALLOC_N(ndr, r->rids, size_rids_0);
    265285                _mem_save_rids_0 = NDR_PULL_GET_MEM_CTX(ndr);
    266286                NDR_PULL_SET_MEM_CTX(ndr, r->rids, 0);
    267                 for (cntr_rids_0 = 0; cntr_rids_0 < r->num_rids; cntr_rids_0++) {
     287                for (cntr_rids_0 = 0; cntr_rids_0 < size_rids_0; cntr_rids_0++) {
    268288                        NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->rids[cntr_rids_0]));
    269289                }
     
    321341{
    322342        uint32_t _ptr_name;
     343        uint32_t size_name_1 = 0;
     344        uint32_t length_name_1 = 0;
    323345        TALLOC_CTX *_mem_save_name_0;
    324346        if (ndr_flags & NDR_SCALARS) {
     
    340362                        NDR_CHECK(ndr_pull_array_size(ndr, &r->name));
    341363                        NDR_CHECK(ndr_pull_array_length(ndr, &r->name));
    342                         if (ndr_get_array_length(ndr, &r->name) > ndr_get_array_size(ndr, &r->name)) {
    343                                 return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE, "Bad array size %u should exceed array length %u", ndr_get_array_size(ndr, &r->name), ndr_get_array_length(ndr, &r->name));
     364                        size_name_1 = ndr_get_array_size(ndr, &r->name);
     365                        length_name_1 = ndr_get_array_length(ndr, &r->name);
     366                        if (length_name_1 > size_name_1) {
     367                                return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE, "Bad array size %u should exceed array length %u", size_name_1, length_name_1);
    344368                        }
    345                         NDR_CHECK(ndr_check_string_terminator(ndr, ndr_get_array_length(ndr, &r->name), sizeof(uint8_t)));
    346                         NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->name, ndr_get_array_length(ndr, &r->name), sizeof(uint8_t), CH_UTF8));
     369                        NDR_CHECK(ndr_check_string_terminator(ndr, length_name_1, sizeof(uint8_t)));
     370                        NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->name, length_name_1, sizeof(uint8_t), CH_UTF8));
    347371                        NDR_PULL_SET_MEM_CTX(ndr, _mem_save_name_0, 0);
    348372                }
     
    388412_PUBLIC_ enum ndr_err_code ndr_pull_wbint_Principals(struct ndr_pull *ndr, int ndr_flags, struct wbint_Principals *r)
    389413{
     414        uint32_t size_principals_0 = 0;
    390415        uint32_t cntr_principals_0;
    391416        TALLOC_CTX *_mem_save_principals_0;
     
    394419                NDR_CHECK(ndr_pull_align(ndr, 5));
    395420                NDR_CHECK(ndr_pull_int32(ndr, NDR_SCALARS, &r->num_principals));
    396                 NDR_PULL_ALLOC_N(ndr, r->principals, ndr_get_array_size(ndr, &r->principals));
     421                size_principals_0 = ndr_get_array_size(ndr, &r->principals);
     422                NDR_PULL_ALLOC_N(ndr, r->principals, size_principals_0);
    397423                _mem_save_principals_0 = NDR_PULL_GET_MEM_CTX(ndr);
    398424                NDR_PULL_SET_MEM_CTX(ndr, r->principals, 0);
    399                 for (cntr_principals_0 = 0; cntr_principals_0 < r->num_principals; cntr_principals_0++) {
     425                for (cntr_principals_0 = 0; cntr_principals_0 < size_principals_0; cntr_principals_0++) {
    400426                        NDR_CHECK(ndr_pull_wbint_Principal(ndr, NDR_SCALARS, &r->principals[cntr_principals_0]));
    401427                }
     
    407433        }
    408434        if (ndr_flags & NDR_BUFFERS) {
     435                size_principals_0 = ndr_get_array_size(ndr, &r->principals);
    409436                _mem_save_principals_0 = NDR_PULL_GET_MEM_CTX(ndr);
    410437                NDR_PULL_SET_MEM_CTX(ndr, r->principals, 0);
    411                 for (cntr_principals_0 = 0; cntr_principals_0 < r->num_principals; cntr_principals_0++) {
     438                for (cntr_principals_0 = 0; cntr_principals_0 < size_principals_0; cntr_principals_0++) {
    412439                        NDR_CHECK(ndr_pull_wbint_Principal(ndr, NDR_BUFFERS, &r->principals[cntr_principals_0]));
    413440                }
     
    458485_PUBLIC_ enum ndr_err_code ndr_pull_wbint_userinfos(struct ndr_pull *ndr, int ndr_flags, struct wbint_userinfos *r)
    459486{
     487        uint32_t size_userinfos_0 = 0;
    460488        uint32_t cntr_userinfos_0;
    461489        TALLOC_CTX *_mem_save_userinfos_0;
     
    464492                NDR_CHECK(ndr_pull_align(ndr, 8));
    465493                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->num_userinfos));
    466                 NDR_PULL_ALLOC_N(ndr, r->userinfos, ndr_get_array_size(ndr, &r->userinfos));
     494                size_userinfos_0 = ndr_get_array_size(ndr, &r->userinfos);
     495                NDR_PULL_ALLOC_N(ndr, r->userinfos, size_userinfos_0);
    467496                _mem_save_userinfos_0 = NDR_PULL_GET_MEM_CTX(ndr);
    468497                NDR_PULL_SET_MEM_CTX(ndr, r->userinfos, 0);
    469                 for (cntr_userinfos_0 = 0; cntr_userinfos_0 < r->num_userinfos; cntr_userinfos_0++) {
     498                for (cntr_userinfos_0 = 0; cntr_userinfos_0 < size_userinfos_0; cntr_userinfos_0++) {
    470499                        NDR_CHECK(ndr_pull_wbint_userinfo(ndr, NDR_SCALARS, &r->userinfos[cntr_userinfos_0]));
    471500                }
     
    477506        }
    478507        if (ndr_flags & NDR_BUFFERS) {
     508                size_userinfos_0 = ndr_get_array_size(ndr, &r->userinfos);
    479509                _mem_save_userinfos_0 = NDR_PULL_GET_MEM_CTX(ndr);
    480510                NDR_PULL_SET_MEM_CTX(ndr, r->userinfos, 0);
    481                 for (cntr_userinfos_0 = 0; cntr_userinfos_0 < r->num_userinfos; cntr_userinfos_0++) {
     511                for (cntr_userinfos_0 = 0; cntr_userinfos_0 < size_userinfos_0; cntr_userinfos_0++) {
    482512                        NDR_CHECK(ndr_pull_wbint_userinfo(ndr, NDR_BUFFERS, &r->userinfos[cntr_userinfos_0]));
    483513                }
     
    634664{
    635665        uint32_t _ptr_domain;
     666        uint32_t size_domain_2 = 0;
     667        uint32_t length_domain_2 = 0;
    636668        uint32_t _ptr_name;
     669        uint32_t size_name_2 = 0;
     670        uint32_t length_name_2 = 0;
    637671        TALLOC_CTX *_mem_save_sid_0;
    638672        TALLOC_CTX *_mem_save_type_0;
     
    682716                        NDR_CHECK(ndr_pull_array_size(ndr, r->out.domain));
    683717                        NDR_CHECK(ndr_pull_array_length(ndr, r->out.domain));
    684                         if (ndr_get_array_length(ndr, r->out.domain) > ndr_get_array_size(ndr, r->out.domain)) {
    685                                 return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE, "Bad array size %u should exceed array length %u", ndr_get_array_size(ndr, r->out.domain), ndr_get_array_length(ndr, r->out.domain));
     718                        size_domain_2 = ndr_get_array_size(ndr, r->out.domain);
     719                        length_domain_2 = ndr_get_array_length(ndr, r->out.domain);
     720                        if (length_domain_2 > size_domain_2) {
     721                                return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE, "Bad array size %u should exceed array length %u", size_domain_2, length_domain_2);
    686722                        }
    687                         NDR_CHECK(ndr_check_string_terminator(ndr, ndr_get_array_length(ndr, r->out.domain), sizeof(uint8_t)));
    688                         NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, r->out.domain, ndr_get_array_length(ndr, r->out.domain), sizeof(uint8_t), CH_UTF8));
     723                        NDR_CHECK(ndr_check_string_terminator(ndr, length_domain_2, sizeof(uint8_t)));
     724                        NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, r->out.domain, length_domain_2, sizeof(uint8_t), CH_UTF8));
    689725                        NDR_PULL_SET_MEM_CTX(ndr, _mem_save_domain_1, 0);
    690726                }
     
    706742                        NDR_CHECK(ndr_pull_array_size(ndr, r->out.name));
    707743                        NDR_CHECK(ndr_pull_array_length(ndr, r->out.name));
    708                         if (ndr_get_array_length(ndr, r->out.name) > ndr_get_array_size(ndr, r->out.name)) {
    709                                 return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE, "Bad array size %u should exceed array length %u", ndr_get_array_size(ndr, r->out.name), ndr_get_array_length(ndr, r->out.name));
     744                        size_name_2 = ndr_get_array_size(ndr, r->out.name);
     745                        length_name_2 = ndr_get_array_length(ndr, r->out.name);
     746                        if (length_name_2 > size_name_2) {
     747                                return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE, "Bad array size %u should exceed array length %u", size_name_2, length_name_2);
    710748                        }
    711                         NDR_CHECK(ndr_check_string_terminator(ndr, ndr_get_array_length(ndr, r->out.name), sizeof(uint8_t)));
    712                         NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, r->out.name, ndr_get_array_length(ndr, r->out.name), sizeof(uint8_t), CH_UTF8));
     749                        NDR_CHECK(ndr_check_string_terminator(ndr, length_name_2, sizeof(uint8_t)));
     750                        NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, r->out.name, length_name_2, sizeof(uint8_t), CH_UTF8));
    713751                        NDR_PULL_SET_MEM_CTX(ndr, _mem_save_name_1, 0);
    714752                }
     
    801839static enum ndr_err_code ndr_pull_wbint_LookupName(struct ndr_pull *ndr, int flags, struct wbint_LookupName *r)
    802840{
     841        uint32_t size_domain_1 = 0;
     842        uint32_t length_domain_1 = 0;
     843        uint32_t size_name_1 = 0;
     844        uint32_t length_name_1 = 0;
    803845        TALLOC_CTX *_mem_save_type_0;
    804846        TALLOC_CTX *_mem_save_sid_0;
     
    808850                NDR_CHECK(ndr_pull_array_size(ndr, &r->in.domain));
    809851                NDR_CHECK(ndr_pull_array_length(ndr, &r->in.domain));
    810                 if (ndr_get_array_length(ndr, &r->in.domain) > ndr_get_array_size(ndr, &r->in.domain)) {
    811                         return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE, "Bad array size %u should exceed array length %u", ndr_get_array_size(ndr, &r->in.domain), ndr_get_array_length(ndr, &r->in.domain));
    812                 }
    813                 NDR_CHECK(ndr_check_string_terminator(ndr, ndr_get_array_length(ndr, &r->in.domain), sizeof(uint8_t)));
    814                 NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->in.domain, ndr_get_array_length(ndr, &r->in.domain), sizeof(uint8_t), CH_UTF8));
     852                size_domain_1 = ndr_get_array_size(ndr, &r->in.domain);
     853                length_domain_1 = ndr_get_array_length(ndr, &r->in.domain);
     854                if (length_domain_1 > size_domain_1) {
     855                        return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE, "Bad array size %u should exceed array length %u", size_domain_1, length_domain_1);
     856                }
     857                NDR_CHECK(ndr_check_string_terminator(ndr, length_domain_1, sizeof(uint8_t)));
     858                NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->in.domain, length_domain_1, sizeof(uint8_t), CH_UTF8));
    815859                NDR_CHECK(ndr_pull_array_size(ndr, &r->in.name));
    816860                NDR_CHECK(ndr_pull_array_length(ndr, &r->in.name));
    817                 if (ndr_get_array_length(ndr, &r->in.name) > ndr_get_array_size(ndr, &r->in.name)) {
    818                         return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE, "Bad array size %u should exceed array length %u", ndr_get_array_size(ndr, &r->in.name), ndr_get_array_length(ndr, &r->in.name));
    819                 }
    820                 NDR_CHECK(ndr_check_string_terminator(ndr, ndr_get_array_length(ndr, &r->in.name), sizeof(uint8_t)));
    821                 NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->in.name, ndr_get_array_length(ndr, &r->in.name), sizeof(uint8_t), CH_UTF8));
     861                size_name_1 = ndr_get_array_size(ndr, &r->in.name);
     862                length_name_1 = ndr_get_array_length(ndr, &r->in.name);
     863                if (length_name_1 > size_name_1) {
     864                        return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE, "Bad array size %u should exceed array length %u", size_name_1, length_name_1);
     865                }
     866                NDR_CHECK(ndr_check_string_terminator(ndr, length_name_1, sizeof(uint8_t)));
     867                NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->in.name, length_name_1, sizeof(uint8_t), CH_UTF8));
    822868                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.flags));
    823869                NDR_PULL_ALLOC(ndr, r->out.type);
     
    912958{
    913959        uint32_t _ptr_dom_name;
     960        uint32_t size_dom_name_1 = 0;
     961        uint32_t length_dom_name_1 = 0;
    914962        TALLOC_CTX *_mem_save_dom_name_0;
    915963        TALLOC_CTX *_mem_save_sid_0;
     
    929977                        NDR_CHECK(ndr_pull_array_size(ndr, &r->in.dom_name));
    930978                        NDR_CHECK(ndr_pull_array_length(ndr, &r->in.dom_name));
    931                         if (ndr_get_array_length(ndr, &r->in.dom_name) > ndr_get_array_size(ndr, &r->in.dom_name)) {
    932                                 return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE, "Bad array size %u should exceed array length %u", ndr_get_array_size(ndr, &r->in.dom_name), ndr_get_array_length(ndr, &r->in.dom_name));
     979                        size_dom_name_1 = ndr_get_array_size(ndr, &r->in.dom_name);
     980                        length_dom_name_1 = ndr_get_array_length(ndr, &r->in.dom_name);
     981                        if (length_dom_name_1 > size_dom_name_1) {
     982                                return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE, "Bad array size %u should exceed array length %u", size_dom_name_1, length_dom_name_1);
    933983                        }
    934                         NDR_CHECK(ndr_check_string_terminator(ndr, ndr_get_array_length(ndr, &r->in.dom_name), sizeof(uint8_t)));
    935                         NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->in.dom_name, ndr_get_array_length(ndr, &r->in.dom_name), sizeof(uint8_t), CH_UTF8));
     984                        NDR_CHECK(ndr_check_string_terminator(ndr, length_dom_name_1, sizeof(uint8_t)));
     985                        NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->in.dom_name, length_dom_name_1, sizeof(uint8_t), CH_UTF8));
    936986                        NDR_PULL_SET_MEM_CTX(ndr, _mem_save_dom_name_0, 0);
    937987                }
     
    10221072{
    10231073        uint32_t _ptr_dom_name;
     1074        uint32_t size_dom_name_1 = 0;
     1075        uint32_t length_dom_name_1 = 0;
    10241076        TALLOC_CTX *_mem_save_dom_name_0;
    10251077        TALLOC_CTX *_mem_save_sid_0;
     
    10391091                        NDR_CHECK(ndr_pull_array_size(ndr, &r->in.dom_name));
    10401092                        NDR_CHECK(ndr_pull_array_length(ndr, &r->in.dom_name));
    1041                         if (ndr_get_array_length(ndr, &r->in.dom_name) > ndr_get_array_size(ndr, &r->in.dom_name)) {
    1042                                 return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE, "Bad array size %u should exceed array length %u", ndr_get_array_size(ndr, &r->in.dom_name), ndr_get_array_length(ndr, &r->in.dom_name));
     1093                        size_dom_name_1 = ndr_get_array_size(ndr, &r->in.dom_name);
     1094                        length_dom_name_1 = ndr_get_array_length(ndr, &r->in.dom_name);
     1095                        if (length_dom_name_1 > size_dom_name_1) {
     1096                                return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE, "Bad array size %u should exceed array length %u", size_dom_name_1, length_dom_name_1);
    10431097                        }
    1044                         NDR_CHECK(ndr_check_string_terminator(ndr, ndr_get_array_length(ndr, &r->in.dom_name), sizeof(uint8_t)));
    1045                         NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->in.dom_name, ndr_get_array_length(ndr, &r->in.dom_name), sizeof(uint8_t), CH_UTF8));
     1098                        NDR_CHECK(ndr_check_string_terminator(ndr, length_dom_name_1, sizeof(uint8_t)));
     1099                        NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->in.dom_name, length_dom_name_1, sizeof(uint8_t), CH_UTF8));
    10461100                        NDR_PULL_SET_MEM_CTX(ndr, _mem_save_dom_name_0, 0);
    10471101                }
     
    11291183{
    11301184        uint32_t _ptr_dom_name;
     1185        uint32_t size_dom_name_1 = 0;
     1186        uint32_t length_dom_name_1 = 0;
    11311187        TALLOC_CTX *_mem_save_dom_name_0;
    11321188        TALLOC_CTX *_mem_save_sid_0;
     
    11451201                        NDR_CHECK(ndr_pull_array_size(ndr, &r->in.dom_name));
    11461202                        NDR_CHECK(ndr_pull_array_length(ndr, &r->in.dom_name));
    1147                         if (ndr_get_array_length(ndr, &r->in.dom_name) > ndr_get_array_size(ndr, &r->in.dom_name)) {
    1148                                 return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE, "Bad array size %u should exceed array length %u", ndr_get_array_size(ndr, &r->in.dom_name), ndr_get_array_length(ndr, &r->in.dom_name));
     1203                        size_dom_name_1 = ndr_get_array_size(ndr, &r->in.dom_name);
     1204                        length_dom_name_1 = ndr_get_array_length(ndr, &r->in.dom_name);
     1205                        if (length_dom_name_1 > size_dom_name_1) {
     1206                                return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE, "Bad array size %u should exceed array length %u", size_dom_name_1, length_dom_name_1);
    11491207                        }
    1150                         NDR_CHECK(ndr_check_string_terminator(ndr, ndr_get_array_length(ndr, &r->in.dom_name), sizeof(uint8_t)));
    1151                         NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->in.dom_name, ndr_get_array_length(ndr, &r->in.dom_name), sizeof(uint8_t), CH_UTF8));
     1208                        NDR_CHECK(ndr_check_string_terminator(ndr, length_dom_name_1, sizeof(uint8_t)));
     1209                        NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->in.dom_name, length_dom_name_1, sizeof(uint8_t), CH_UTF8));
    11521210                        NDR_PULL_SET_MEM_CTX(ndr, _mem_save_dom_name_0, 0);
    11531211                }
     
    12261284{
    12271285        uint32_t _ptr_dom_name;
     1286        uint32_t size_dom_name_1 = 0;
     1287        uint32_t length_dom_name_1 = 0;
    12281288        TALLOC_CTX *_mem_save_dom_name_0;
    12291289        TALLOC_CTX *_mem_save_sid_0;
     
    12421302                        NDR_CHECK(ndr_pull_array_size(ndr, &r->in.dom_name));
    12431303                        NDR_CHECK(ndr_pull_array_length(ndr, &r->in.dom_name));
    1244                         if (ndr_get_array_length(ndr, &r->in.dom_name) > ndr_get_array_size(ndr, &r->in.dom_name)) {
    1245                                 return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE, "Bad array size %u should exceed array length %u", ndr_get_array_size(ndr, &r->in.dom_name), ndr_get_array_length(ndr, &r->in.dom_name));
     1304                        size_dom_name_1 = ndr_get_array_size(ndr, &r->in.dom_name);
     1305                        length_dom_name_1 = ndr_get_array_length(ndr, &r->in.dom_name);
     1306                        if (length_dom_name_1 > size_dom_name_1) {
     1307                                return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE, "Bad array size %u should exceed array length %u", size_dom_name_1, length_dom_name_1);
    12461308                        }
    1247                         NDR_CHECK(ndr_check_string_terminator(ndr, ndr_get_array_length(ndr, &r->in.dom_name), sizeof(uint8_t)));
    1248                         NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->in.dom_name, ndr_get_array_length(ndr, &r->in.dom_name), sizeof(uint8_t), CH_UTF8));
     1309                        NDR_CHECK(ndr_check_string_terminator(ndr, length_dom_name_1, sizeof(uint8_t)));
     1310                        NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->in.dom_name, length_dom_name_1, sizeof(uint8_t), CH_UTF8));
    12491311                        NDR_PULL_SET_MEM_CTX(ndr, _mem_save_dom_name_0, 0);
    12501312                }
     
    19522014static enum ndr_err_code ndr_pull_wbint_DsGetDcName(struct ndr_pull *ndr, int flags, struct wbint_DsGetDcName *r)
    19532015{
     2016        uint32_t size_domain_name_1 = 0;
     2017        uint32_t length_domain_name_1 = 0;
    19542018        uint32_t _ptr_domain_guid;
    19552019        uint32_t _ptr_site_name;
     2020        uint32_t size_site_name_1 = 0;
     2021        uint32_t length_site_name_1 = 0;
    19562022        uint32_t _ptr_dc_info;
    19572023        TALLOC_CTX *_mem_save_domain_guid_0;
     
    19642030                NDR_CHECK(ndr_pull_array_size(ndr, &r->in.domain_name));
    19652031                NDR_CHECK(ndr_pull_array_length(ndr, &r->in.domain_name));
    1966                 if (ndr_get_array_length(ndr, &r->in.domain_name) > ndr_get_array_size(ndr, &r->in.domain_name)) {
    1967                         return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE, "Bad array size %u should exceed array length %u", ndr_get_array_size(ndr, &r->in.domain_name), ndr_get_array_length(ndr, &r->in.domain_name));
    1968                 }
    1969                 NDR_CHECK(ndr_check_string_terminator(ndr, ndr_get_array_length(ndr, &r->in.domain_name), sizeof(uint8_t)));
    1970                 NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->in.domain_name, ndr_get_array_length(ndr, &r->in.domain_name), sizeof(uint8_t), CH_UTF8));
     2032                size_domain_name_1 = ndr_get_array_size(ndr, &r->in.domain_name);
     2033                length_domain_name_1 = ndr_get_array_length(ndr, &r->in.domain_name);
     2034                if (length_domain_name_1 > size_domain_name_1) {
     2035                        return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE, "Bad array size %u should exceed array length %u", size_domain_name_1, length_domain_name_1);
     2036                }
     2037                NDR_CHECK(ndr_check_string_terminator(ndr, length_domain_name_1, sizeof(uint8_t)));
     2038                NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->in.domain_name, length_domain_name_1, sizeof(uint8_t), CH_UTF8));
    19712039                NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_domain_guid));
    19722040                if (_ptr_domain_guid) {
     
    19922060                        NDR_CHECK(ndr_pull_array_size(ndr, &r->in.site_name));
    19932061                        NDR_CHECK(ndr_pull_array_length(ndr, &r->in.site_name));
    1994                         if (ndr_get_array_length(ndr, &r->in.site_name) > ndr_get_array_size(ndr, &r->in.site_name)) {
    1995                                 return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE, "Bad array size %u should exceed array length %u", ndr_get_array_size(ndr, &r->in.site_name), ndr_get_array_length(ndr, &r->in.site_name));
     2062                        size_site_name_1 = ndr_get_array_size(ndr, &r->in.site_name);
     2063                        length_site_name_1 = ndr_get_array_length(ndr, &r->in.site_name);
     2064                        if (length_site_name_1 > size_site_name_1) {
     2065                                return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE, "Bad array size %u should exceed array length %u", size_site_name_1, length_site_name_1);
    19962066                        }
    1997                         NDR_CHECK(ndr_check_string_terminator(ndr, ndr_get_array_length(ndr, &r->in.site_name), sizeof(uint8_t)));
    1998                         NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->in.site_name, ndr_get_array_length(ndr, &r->in.site_name), sizeof(uint8_t), CH_UTF8));
     2067                        NDR_CHECK(ndr_check_string_terminator(ndr, length_site_name_1, sizeof(uint8_t)));
     2068                        NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->in.site_name, length_site_name_1, sizeof(uint8_t), CH_UTF8));
    19992069                        NDR_PULL_SET_MEM_CTX(ndr, _mem_save_site_name_0, 0);
    20002070                }
     
    21092179{
    21102180        uint32_t _ptr_domain_name;
     2181        uint32_t size_domain_name_2 = 0;
     2182        uint32_t length_domain_name_2 = 0;
    21112183        TALLOC_CTX *_mem_save_domain_sid_0;
    21122184        TALLOC_CTX *_mem_save_rids_0;
     
    21532225                        NDR_CHECK(ndr_pull_array_size(ndr, r->out.domain_name));
    21542226                        NDR_CHECK(ndr_pull_array_length(ndr, r->out.domain_name));
    2155                         if (ndr_get_array_length(ndr, r->out.domain_name) > ndr_get_array_size(ndr, r->out.domain_name)) {
    2156                                 return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE, "Bad array size %u should exceed array length %u", ndr_get_array_size(ndr, r->out.domain_name), ndr_get_array_length(ndr, r->out.domain_name));
     2227                        size_domain_name_2 = ndr_get_array_size(ndr, r->out.domain_name);
     2228                        length_domain_name_2 = ndr_get_array_length(ndr, r->out.domain_name);
     2229                        if (length_domain_name_2 > size_domain_name_2) {
     2230                                return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE, "Bad array size %u should exceed array length %u", size_domain_name_2, length_domain_name_2);
    21572231                        }
    2158                         NDR_CHECK(ndr_check_string_terminator(ndr, ndr_get_array_length(ndr, r->out.domain_name), sizeof(uint8_t)));
    2159                         NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, r->out.domain_name, ndr_get_array_length(ndr, r->out.domain_name), sizeof(uint8_t), CH_UTF8));
     2232                        NDR_CHECK(ndr_check_string_terminator(ndr, length_domain_name_2, sizeof(uint8_t)));
     2233                        NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, r->out.domain_name, length_domain_name_2, sizeof(uint8_t), CH_UTF8));
    21602234                        NDR_PULL_SET_MEM_CTX(ndr, _mem_save_domain_name_1, 0);
    21612235                }
Note: See TracChangeset for help on using the changeset viewer.