summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2002-02-15 23:11:13 +0000
committerAndrew Bartlett <abartlet@samba.org>2002-02-15 23:11:13 +0000
commitba9341c7de216acea5fc194fb42944714553a1a5 (patch)
tree53ed3245e422e0d50976cc751069839ad263e772 /source3
parentae9bac99fa9cda2e480afa10a7c00b37ad4fd255 (diff)
downloadsamba-ba9341c7de216acea5fc194fb42944714553a1a5.tar.gz
samba-ba9341c7de216acea5fc194fb42944714553a1a5.tar.bz2
samba-ba9341c7de216acea5fc194fb42944714553a1a5.zip
Try not to malloc -1 bytes (apx 4GB) when the data is already in error.
Andrew Bartlett (This used to be commit ad1faf8fa4019cb57fbb7f311f6d4943359bcd45)
Diffstat (limited to 'source3')
-rw-r--r--source3/libsmb/clispnego.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/source3/libsmb/clispnego.c b/source3/libsmb/clispnego.c
index a962953b90..a4fcfa5d9a 100644
--- a/source3/libsmb/clispnego.c
+++ b/source3/libsmb/clispnego.c
@@ -247,13 +247,23 @@ BOOL spnego_parse_krb5_wrap(DATA_BLOB blob, DATA_BLOB *ticket)
{
BOOL ret;
ASN1_DATA data;
+ int data_remaining;
asn1_load(&data, blob);
asn1_start_tag(&data, ASN1_APPLICATION(0));
asn1_check_OID(&data, OID_KERBEROS5);
asn1_check_BOOLEAN(&data, 0);
- *ticket = data_blob(data.data, asn1_tag_remaining(&data));
- asn1_read(&data, ticket->data, ticket->length);
+
+ data_remaining = asn1_tag_remaining(&data);
+
+ if (data_remaining < 1) {
+ data.has_error = True;
+ } else {
+
+ *ticket = data_blob(data.data, data_remaining);
+ asn1_read(&data, ticket->data, ticket->length);
+ }
+
asn1_end_tag(&data);
ret = !data.has_error;