Fix null pointer errors.
authorDr. Stephen Henson <steve@openssl.org>
Tue, 10 Jun 2014 13:47:29 +0000 (14:47 +0100)
committerDr. Stephen Henson <steve@openssl.org>
Tue, 10 Jun 2014 13:48:12 +0000 (14:48 +0100)
PR#3394
(cherry picked from commit 7a9d59c148b773f59a41f8697eeecf369a0974c2)

crypto/ocsp/ocsp_ht.c
ssl/d1_both.c

index af5fc16691d432d4969126a5e64640e4a1775a14..b4126ade516929af1232dbf100ea92e89f8beb2a 100644 (file)
@@ -490,6 +490,9 @@ OCSP_RESPONSE *OCSP_sendreq_bio(BIO *b, char *path, OCSP_REQUEST *req)
 
        ctx = OCSP_sendreq_new(b, path, req, -1);
 
+       if (!ctx)
+               return NULL;
+
        do
                {
                rv = OCSP_sendreq_nbio(&resp, ctx);
index f4fc5bc0abc420921157c7d609b5e641ec9cf74c..eaa2548a3aa33db1077fb437a373d73b75c8c9f4 100644 (file)
@@ -1176,6 +1176,8 @@ dtls1_buffer_message(SSL *s, int is_ccs)
        OPENSSL_assert(s->init_off == 0);
 
        frag = dtls1_hm_fragment_new(s->init_num, 0);
+       if (!frag)
+               return 0;
 
        memcpy(frag->fragment, s->init_buf->data, s->init_num);