[openssl-commits] [openssl] OpenSSL_1_0_2-stable update

Emilia Kasper emilia at openssl.org
Tue Mar 10 20:53:07 UTC 2015


The branch OpenSSL_1_0_2-stable has been updated
       via  0c14565c5b7683e4bd47cf299b2f6d4bc26d61aa (commit)
      from  5a9e9669d8073ddc5efeea08f3daee42509b2aa7 (commit)


- Log -----------------------------------------------------------------
commit 0c14565c5b7683e4bd47cf299b2f6d4bc26d61aa
Author: Emilia Kasper <emilia at openssl.org>
Date:   Wed Mar 4 13:05:53 2015 -0800

    Harmonize return values in dtls1_buffer_record
    
    Ensure all malloc failures return -1.
    
    Reported by Adam Langley (Google).
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (cherry picked from commit 06c6a2b4a3a6e64303caa256398dd2dc16f9c35a)

-----------------------------------------------------------------------

Summary of changes:
 ssl/d1_pkt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ssl/d1_pkt.c b/ssl/d1_pkt.c
index bf96f60..940ca69 100644
--- a/ssl/d1_pkt.c
+++ b/ssl/d1_pkt.c
@@ -236,7 +236,7 @@ dtls1_buffer_record(SSL *s, record_pqueue *queue, unsigned char *priority)
             pitem_free(item);
 
         SSLerr(SSL_F_DTLS1_BUFFER_RECORD, ERR_R_INTERNAL_ERROR);
-        return (0);
+        return -1;
     }
 
     rdata->packet = s->packet;


More information about the openssl-commits mailing list