diff options
| author | Samba Release Account <samba-bugs@samba.org> | 2004-09-15 20:55:31 +0000 |
|---|---|---|
| committer | Samba Release Account <samba-bugs@samba.org> | 2004-09-15 20:55:31 +0000 |
| commit | f36cd948f0006d177ff67ab5bb2636d32493ce28 (patch) | |
| tree | 694c2e10110f45bfb353e32503e996ada88cbfc2 /source | |
| parent | a5e52679d86c42b308b58603517f7806494f4378 (diff) | |
| download | samba-f36cd948f0006d177ff67ab5bb2636d32493ce28.tar.gz samba-f36cd948f0006d177ff67ab5bb2636d32493ce28.tar.xz samba-f36cd948f0006d177ff67ab5bb2636d32493ce28.zip | |
r2356: commit the changes from the 3.0.7 release that were held back until the security announcement
Diffstat (limited to 'source')
| -rw-r--r-- | source/libsmb/asn1.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source/libsmb/asn1.c b/source/libsmb/asn1.c index ca14f3fbb71..2807b4e1d3e 100644 --- a/source/libsmb/asn1.c +++ b/source/libsmb/asn1.c @@ -219,6 +219,9 @@ BOOL asn1_load(ASN1_DATA *data, DATA_BLOB blob) /* read from a ASN1 buffer, advancing the buffer pointer */ BOOL asn1_read(ASN1_DATA *data, void *p, int len) { + if (data->has_error) + return False; + if (len < 0 || data->ofs + len < data->ofs || data->ofs + len < len) { data->has_error = True; return False; @@ -309,6 +312,9 @@ BOOL asn1_end_tag(ASN1_DATA *data) /* work out how many bytes are left in this nested tag */ int asn1_tag_remaining(ASN1_DATA *data) { + if (data->has_error) + return 0; + if (!data->nesting) { data->has_error = True; return -1; |