Changeset 745 for trunk/server/libcli/auth/spnego_parse.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• libcli/auth/spnego_parse.c (modified) (4 diffs)

trunk/server/libcli/auth/spnego_parse.c

@@ -50 +50 @@
                         for (i = 0; !asn1->has_error &&
                                      0 < asn1_tag_remaining(asn1); i++) {
+                                char *oid;
                                 token->mechTypes = talloc_realloc(NULL,
                                                                   token->mechTypes,
                                                                   const char *, i+2);
-                                asn1_read_OID(asn1, token->mechTypes, token->mechTypes + i);
+                                asn1_read_OID(asn1, token->mechTypes, &oid);
+                                token->mechTypes[i] = oid;
                         }
                         token->mechTypes[i] = NULL;
@@ -185 +187 @@
         while (!asn1->has_error && 0 < asn1_tag_remaining(asn1)) {
                 uint8_t context;
+                char *oid;
                 if (!asn1_peek_uint8(asn1, &context)) {
                         asn1->has_error = true;
@@ -200 +203 @@
                 case ASN1_CONTEXT(1):
                         asn1_start_tag(asn1, ASN1_CONTEXT(1));
-                        asn1_read_OID(asn1, mem_ctx, &token->supportedMech);
+                        asn1_read_OID(asn1, mem_ctx, &oid);
+                        token->supportedMech = oid;
                         asn1_end_tag(asn1);
                         break;
@@ -381 +385 @@
         struct asn1_data *asn1 = asn1_init(mem_ctx);
 
+        if (asn1 == NULL) {
+                return false;
+        }
+
         /* Write mechTypes */
         if (mech_types && *mech_types) {