Merge branch 'v3-0-test' of ssh://jra@git.samba.org/data/git/samba into v3-0-test

diff --git a/source/libsmb/asn1.c b/source/libsmb/asn1.c
index 6ebe9ab62cf88405106e877b345cac94d503531b..0ad8f2403ee22e598883dc9cae404470e48ff79c 100644 (file)
--- a/source/libsmb/asn1.c
+++ b/source/libsmb/asn1.c
@@ -396,6 +396,7 @@ BOOL asn1_check_OID(ASN1_DATA *data, const char *OID)
 
        if (strcmp(id, OID) != 0) {
                data->has_error = True;
+               free(id);
                return False;
        }
        free(id);