diff options
| author | Stef Walter <stef@thewalter.net> | 2013-07-23 16:45:50 +0200 |
|---|---|---|
| committer | Stef Walter <stef@thewalter.net> | 2013-07-23 23:06:30 +0200 |
| commit | b14fc0351c4dd71c5ca71df77e325d2b2a4c0583 (patch) | |
| tree | c4a47c77a977158b8bd4dcc8f478d6bc34ad233b /trust/builder.c | |
| parent | b7cc29a78c3c705374ff25223fe14749ddb076b9 (diff) | |
| download | p11-kit-b14fc0351c4dd71c5ca71df77e325d2b2a4c0583.tar.gz | |
Fix various memory leaks exposed by 'make leakcheck'
Diffstat (limited to 'trust/builder.c')
| -rw-r--r-- | trust/builder.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/trust/builder.c b/trust/builder.c index 2daadb3..18c09ad 100644 --- a/trust/builder.c +++ b/trust/builder.c @@ -1018,9 +1018,6 @@ build_for_schema (p11_builder *builder, } } - if (populate && schema->populate) - *extra = schema->populate (builder, index, merge); - /* Validate the result, before committing to the change. */ if (!loading && schema->validate) { rv = (schema->validate) (builder, attrs, merge); @@ -1028,6 +1025,9 @@ build_for_schema (p11_builder *builder, return rv; } + if (populate && schema->populate) + *extra = schema->populate (builder, index, merge); + return CKR_OK; } |