diff options
author | tb <> | 2025-03-07 10:57:29 +0000 |
---|---|---|
committer | tb <> | 2025-03-07 10:57:29 +0000 |
commit | dd7cad4ac6e5632efe1e2fd3ed0e9e80e2405328 (patch) | |
tree | 91e0f2665d0db52a532e75e7d63911750d645250 | |
parent | 41c00d0a9c6dadd73a0b529b8b28a4205e18870f (diff) | |
download | openbsd-dd7cad4ac6e5632efe1e2fd3ed0e9e80e2405328.tar.gz openbsd-dd7cad4ac6e5632efe1e2fd3ed0e9e80e2405328.tar.bz2 openbsd-dd7cad4ac6e5632efe1e2fd3ed0e9e80e2405328.zip |
_CONF_new_section(): avoid silly ok dance
ok jsing
-rw-r--r-- | src/lib/libcrypto/conf/conf_api.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/src/lib/libcrypto/conf/conf_api.c b/src/lib/libcrypto/conf/conf_api.c index b0056bcbe6..511f9d6470 100644 --- a/src/lib/libcrypto/conf/conf_api.c +++ b/src/lib/libcrypto/conf/conf_api.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: conf_api.c,v 1.23 2025/03/07 10:54:51 tb Exp $ */ | 1 | /* $OpenBSD: conf_api.c,v 1.24 2025/03/07 10:57:29 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 | * |
@@ -247,7 +247,6 @@ CONF_VALUE * | |||
247 | _CONF_new_section(CONF *conf, const char *section) | 247 | _CONF_new_section(CONF *conf, const char *section) |
248 | { | 248 | { |
249 | STACK_OF(CONF_VALUE) *sk = NULL; | 249 | STACK_OF(CONF_VALUE) *sk = NULL; |
250 | int ok = 0; | ||
251 | CONF_VALUE *v = NULL, *vv; | 250 | CONF_VALUE *v = NULL, *vv; |
252 | 251 | ||
253 | if ((sk = sk_CONF_VALUE_new_null()) == NULL) | 252 | if ((sk = sk_CONF_VALUE_new_null()) == NULL) |
@@ -260,14 +259,12 @@ _CONF_new_section(CONF *conf, const char *section) | |||
260 | 259 | ||
261 | vv = lh_CONF_VALUE_insert(conf->data, v); | 260 | vv = lh_CONF_VALUE_insert(conf->data, v); |
262 | OPENSSL_assert(vv == NULL); | 261 | OPENSSL_assert(vv == NULL); |
263 | ok = 1; | ||
264 | 262 | ||
265 | err: | 263 | return v; |
266 | if (!ok) { | 264 | |
267 | if (sk != NULL) | 265 | err: |
268 | sk_CONF_VALUE_free(sk); | 266 | sk_CONF_VALUE_free(sk); |
269 | free(v); | 267 | free(v); |
270 | v = NULL; | 268 | |
271 | } | 269 | return NULL; |
272 | return (v); | ||
273 | } | 270 | } |