diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-01-18 16:19:39 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-01-18 16:19:39 +0100 |
| commit | bfbb0fb17f4eedb8f22d0694c5d4a3b82dfe189b (patch) | |
| tree | 068b3849e31c7b90a465be8172aac7c2b472d205 /librpc/gen_ndr/ndr_security.c | |
| parent | 5cf9989a70a23e5b955b7229fa95d3e604b1883d (diff) | |
| parent | c45b6ec29a5b3a39b83209e970b645e5ed0a411c (diff) | |
| download | samba-bfbb0fb17f4eedb8f22d0694c5d4a3b82dfe189b.tar.gz samba-bfbb0fb17f4eedb8f22d0694c5d4a3b82dfe189b.tar.bz2 samba-bfbb0fb17f4eedb8f22d0694c5d4a3b82dfe189b.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'librpc/gen_ndr/ndr_security.c')
| -rw-r--r-- | librpc/gen_ndr/ndr_security.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/librpc/gen_ndr/ndr_security.c b/librpc/gen_ndr/ndr_security.c index 64c134dcb8..c227170779 100644 --- a/librpc/gen_ndr/ndr_security.c +++ b/librpc/gen_ndr/ndr_security.c @@ -498,7 +498,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_security_acl(struct ndr_pull *ndr, int ndr_f NDR_CHECK(ndr_pull_security_acl_revision(ndr, NDR_SCALARS, &r->revision)); NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->size)); NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->num_aces)); - if (r->num_aces < 0 || r->num_aces > 1000) { + if (r->num_aces > 1000) { return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range"); } NDR_PULL_ALLOC_N(ndr, r->aces, r->num_aces); @@ -797,7 +797,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_sec_desc_buf(struct ndr_pull *ndr, int ndr_f if (ndr_flags & NDR_SCALARS) { NDR_CHECK(ndr_pull_align(ndr, 4)); NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->sd_size)); - if (r->sd_size < 0 || r->sd_size > 0x40000) { + if (r->sd_size > 0x40000) { return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range"); } NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_sd)); |