[openssl-commits] [openssl] OpenSSL_1_0_1-stable update

[Emilia Kasper]

The branch OpenSSL_1_0_1-stable has been updated
       via  8b7e469d06d7c487342eef1dcca3dc02fe7cd267 (commit)
      from  93cb447df263a0ba91c09be679eef6b1523df4f4 (commit)


- Log -----------------------------------------------------------------
commit 8b7e469d06d7c487342eef1dcca3dc02fe7cd267
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 0985bb0..7b49a7d 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;