]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
libcli/security: simplify wire claim conversion mem, 2/3: one tree
authorDouglas Bagnall <douglas.bagnall@catalyst.net.nz>
Wed, 22 Nov 2023 01:44:30 +0000 (14:44 +1300)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 27 Nov 2023 22:37:32 +0000 (22:37 +0000)
These values would have leaked in the event of failure (but only onto
the caller mem_ctx, which might be fleeting -- especially as its
security token is now failing).

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
libcli/security/claims-conversions.c

index a1e36d4724f48d2a2bd08171eb47ab18861dd545..8103ede55aef5c968c553b2e8be63443ec6d93ba 100644 (file)
@@ -807,7 +807,7 @@ NTSTATUS token_claims_to_claims_v1(TALLOC_CTX *mem_ctx,
                                                }
                                        }
 
-                                       value = talloc(mem_ctx, int64_t);
+                                       value = talloc(claims, int64_t);
                                        if (value == NULL) {
                                                talloc_free(tmp_ctx);
                                                return NT_STATUS_NO_MEMORY;
@@ -854,7 +854,7 @@ NTSTATUS token_claims_to_claims_v1(TALLOC_CTX *mem_ctx,
                                                }
                                        }
 
-                                       value = talloc(mem_ctx, uint64_t);
+                                       value = talloc(claims, uint64_t);
                                        if (value == NULL) {
                                                talloc_free(tmp_ctx);
                                                return NT_STATUS_NO_MEMORY;