Check the result of sk_*_push() operations for failure.

ok doug@ jsing@

1 files changed, 8 insertions, 3 deletions

diff --git a/src/lib/libcrypto/ts/ts_conf.c b/src/lib/libcrypto/ts/ts_conf.c
index ec033b1cfc..5266f91e63 100644
--- a/src/lib/libcrypto/ts/ts_conf.c
+++ b/src/lib/libcrypto/ts/ts_conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ts_conf.c,v 1.7 2014/07/11 08:44:49 jsing Exp $ */
+/* $OpenBSD: ts_conf.c,v 1.8 2014/10/28 05:46:56 miod Exp $ */
 /* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL
  * project 2002.
  */
@@ -110,7 +110,8 @@ end:
         return x;
 }
 
-STACK_OF(X509) *TS_CONF_load_certs(const char *file)
+STACK_OF(X509) *
+TS_CONF_load_certs(const char *file)
 {
         BIO *certs = NULL;
         STACK_OF(X509) *othercerts = NULL;
@@ -126,7 +127,11 @@ STACK_OF(X509) *TS_CONF_load_certs(const char *file)
         for (i = 0; i < sk_X509_INFO_num(allcerts); i++) {
                 X509_INFO *xi = sk_X509_INFO_value(allcerts, i);
                 if (xi->x509) {
-                        sk_X509_push(othercerts, xi->x509);
+                        if (sk_X509_push(othercerts, xi->x509) == 0) {
+                                sk_X509_pop_free(othercerts, X509_free);
+                                othercerts = NULL;
+                                goto end;
+                        }
                         xi->x509 = NULL;
                 }
         }