diff options
author | tb <> | 2024-08-31 09:46:17 +0000 |
---|---|---|
committer | tb <> | 2024-08-31 09:46:17 +0000 |
commit | af86cb620ed97ba6a9aaccee083551eb8285963a (patch) | |
tree | 7bdc1dd5d9309370276dc079c71de9974e59b433 | |
parent | 8ed0a536d68fcf1d741f36e88cb5e42af7f495b1 (diff) | |
download | openbsd-af86cb620ed97ba6a9aaccee083551eb8285963a.tar.gz openbsd-af86cb620ed97ba6a9aaccee083551eb8285963a.tar.bz2 openbsd-af86cb620ed97ba6a9aaccee083551eb8285963a.zip |
Inline last use of CONF_free()
This permits another single-use-no-longer-public API to join the party
in the bit bucket.
ok beck jsing
-rw-r--r-- | src/lib/libcrypto/conf/conf_def.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/lib/libcrypto/conf/conf_def.c b/src/lib/libcrypto/conf/conf_def.c index 20bea03783..0173a7117c 100644 --- a/src/lib/libcrypto/conf/conf_def.c +++ b/src/lib/libcrypto/conf/conf_def.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: conf_def.c,v 1.43 2024/08/31 09:44:00 tb Exp $ */ | 1 | /* $OpenBSD: conf_def.c,v 1.44 2024/08/31 09:46:17 tb Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -319,7 +319,10 @@ err: | |||
319 | *line = eline; | 319 | *line = eline; |
320 | ERR_asprintf_error_data("line %ld", eline); | 320 | ERR_asprintf_error_data("line %ld", eline); |
321 | if ((h != conf->data) && (conf->data != NULL)) { | 321 | if ((h != conf->data) && (conf->data != NULL)) { |
322 | CONF_free(conf->data); | 322 | CONF ctmp; |
323 | |||
324 | CONF_set_nconf(&ctmp, conf->data); | ||
325 | ctmp.meth->destroy_data(&ctmp); | ||
323 | conf->data = NULL; | 326 | conf->data = NULL; |
324 | } | 327 | } |
325 | if (v != NULL) { | 328 | if (v != NULL) { |