summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2010-07-20 09:51:48 -0700
committerJeremy Allison <jra@samba.org>2010-07-20 09:51:48 -0700
commit668744964db9210d7b106dcaa27ea1152bd635cd (patch)
treed8802b5cff5bce048997affab6f28a09ced75070
parentf5def289d3d66e41c0a7ace3145107123e4ea54f (diff)
downloadsamba-668744964db9210d7b106dcaa27ea1152bd635cd.tar.gz
samba-668744964db9210d7b106dcaa27ea1152bd635cd.tar.bz2
samba-668744964db9210d7b106dcaa27ea1152bd635cd.zip
Fixes pointed out by <david.kondrad@legrand.us>. Free memory if not being
returned to caller. Remove unneeded asn1_tag_remaining() calls. Jeremy.
-rw-r--r--source3/libsmb/clispnego.c75
1 files changed, 37 insertions, 38 deletions
diff --git a/source3/libsmb/clispnego.c b/source3/libsmb/clispnego.c
index e1eb03bb6f..891f080df0 100644
--- a/source3/libsmb/clispnego.c
+++ b/source3/libsmb/clispnego.c
@@ -4,7 +4,8 @@
Copyright (C) Andrew Tridgell 2001
Copyright (C) Jim McDonough <jmcd@us.ibm.com> 2002
Copyright (C) Luke Howard 2003
-
+ Copyright (C) Jeremy Allison 2010
+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
@@ -144,50 +145,48 @@ bool spnego_parse_negTokenInit(DATA_BLOB blob,
the next tag is ASN1_CONTEXT(3).
*/
- if (asn1_tag_remaining(data) > 0) {
- if (asn1_peek_tag(data, ASN1_CONTEXT(1))) {
- uint8 flags;
+ if (asn1_peek_tag(data, ASN1_CONTEXT(1))) {
+ uint8 flags;
- /* reqFlags [1] ContextFlags OPTIONAL */
- asn1_start_tag(data, ASN1_CONTEXT(1));
- asn1_start_tag(data, ASN1_BIT_STRING);
- while (asn1_tag_remaining(data) > 0) {
- asn1_read_uint8(data, &flags);
- }
- asn1_end_tag(data);
- asn1_end_tag(data);
+ /* reqFlags [1] ContextFlags OPTIONAL */
+ asn1_start_tag(data, ASN1_CONTEXT(1));
+ asn1_start_tag(data, ASN1_BIT_STRING);
+ while (asn1_tag_remaining(data) > 0) {
+ asn1_read_uint8(data, &flags);
}
+ asn1_end_tag(data);
+ asn1_end_tag(data);
}
- if (asn1_tag_remaining(data) > 0) {
- if (asn1_peek_tag(data, ASN1_CONTEXT(2))) {
- DATA_BLOB sblob = data_blob_null;
- /* mechToken [2] OCTET STRING OPTIONAL */
- asn1_start_tag(data, ASN1_CONTEXT(2));
- asn1_read_OctetString(data, talloc_autofree_context(),
- &sblob);
- asn1_end_tag(data);
- if (secblob) {
- *secblob = sblob;
- }
+ if (asn1_peek_tag(data, ASN1_CONTEXT(2))) {
+ DATA_BLOB sblob = data_blob_null;
+ /* mechToken [2] OCTET STRING OPTIONAL */
+ asn1_start_tag(data, ASN1_CONTEXT(2));
+ asn1_read_OctetString(data, talloc_autofree_context(),
+ &sblob);
+ asn1_end_tag(data);
+ if (secblob) {
+ *secblob = sblob;
+ } else {
+ data_blob_free(&sblob);
}
}
- if (asn1_tag_remaining(data) > 0) {
- if (asn1_peek_tag(data, ASN1_CONTEXT(3))) {
- char *princ = NULL;
- /* mechListMIC [3] OCTET STRING OPTIONAL */
- asn1_start_tag(data, ASN1_CONTEXT(3));
- asn1_start_tag(data, ASN1_SEQUENCE(0));
- asn1_start_tag(data, ASN1_CONTEXT(0));
- asn1_read_GeneralString(data,talloc_autofree_context(),
- &princ);
- asn1_end_tag(data);
- asn1_end_tag(data);
- asn1_end_tag(data);
- if (principal) {
- *principal = princ;
- }
+ if (asn1_peek_tag(data, ASN1_CONTEXT(3))) {
+ char *princ = NULL;
+ /* mechListMIC [3] OCTET STRING OPTIONAL */
+ asn1_start_tag(data, ASN1_CONTEXT(3));
+ asn1_start_tag(data, ASN1_SEQUENCE(0));
+ asn1_start_tag(data, ASN1_CONTEXT(0));
+ asn1_read_GeneralString(data,talloc_autofree_context(),
+ &princ);
+ asn1_end_tag(data);
+ asn1_end_tag(data);
+ asn1_end_tag(data);
+ if (principal) {
+ *principal = princ;
+ } else {
+ TALLOC_FREE(princ);
}
}