diff options
| author | inoguchi <> | 2022-01-28 13:14:48 +0000 |
|---|---|---|
| committer | inoguchi <> | 2022-01-28 13:14:48 +0000 |
| commit | 4e2f7b2d75c51fd52368a6ab05698e22b35a3ab2 (patch) | |
| tree | 775ce40412bfe60e883824ac27b7fc01c98c8931 /src/lib/libssl/ssl_cert.c | |
| parent | 15781cdc3d5f107be8c22bf7f6736e389537e73b (diff) | |
| download | openbsd-4e2f7b2d75c51fd52368a6ab05698e22b35a3ab2.tar.gz openbsd-4e2f7b2d75c51fd52368a6ab05698e22b35a3ab2.tar.bz2 openbsd-4e2f7b2d75c51fd52368a6ab05698e22b35a3ab2.zip | |
Error check for sk_push in libssl
CID 118976 118979
ok tb@
Diffstat (limited to 'src/lib/libssl/ssl_cert.c')
| -rw-r--r-- | src/lib/libssl/ssl_cert.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/lib/libssl/ssl_cert.c b/src/lib/libssl/ssl_cert.c index e91de659ce..71daf3718b 100644 --- a/src/lib/libssl/ssl_cert.c +++ b/src/lib/libssl/ssl_cert.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ssl_cert.c,v 1.93 2022/01/08 12:59:58 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_cert.c,v 1.94 2022/01/28 13:14:48 inoguchi 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 | * |
| @@ -558,8 +558,10 @@ SSL_load_client_CA_file(const char *file) | |||
| 558 | if (sk_X509_NAME_find(sk, xn) >= 0) | 558 | if (sk_X509_NAME_find(sk, xn) >= 0) |
| 559 | X509_NAME_free(xn); | 559 | X509_NAME_free(xn); |
| 560 | else { | 560 | else { |
| 561 | sk_X509_NAME_push(sk, xn); | 561 | if (!sk_X509_NAME_push(sk, xn)) |
| 562 | sk_X509_NAME_push(ret, xn); | 562 | goto err; |
| 563 | if (!sk_X509_NAME_push(ret, xn)) | ||
| 564 | goto err; | ||
| 563 | } | 565 | } |
| 564 | } | 566 | } |
| 565 | 567 | ||
| @@ -619,7 +621,8 @@ SSL_add_file_cert_subjects_to_stack(STACK_OF(X509_NAME) *stack, | |||
| 619 | if (sk_X509_NAME_find(stack, xn) >= 0) | 621 | if (sk_X509_NAME_find(stack, xn) >= 0) |
| 620 | X509_NAME_free(xn); | 622 | X509_NAME_free(xn); |
| 621 | else | 623 | else |
| 622 | sk_X509_NAME_push(stack, xn); | 624 | if (!sk_X509_NAME_push(stack, xn)) |
| 625 | goto err; | ||
| 623 | } | 626 | } |
| 624 | 627 | ||
| 625 | ERR_clear_error(); | 628 | ERR_clear_error(); |
