[openssl-commits] [openssl] master update

[Emilia Kasper]

The branch master has been updated
       via  06c6a2b4a3a6e64303caa256398dd2dc16f9c35a (commit)
      from  460e920d8a274e27aab36346eeda6685a42c3314 (commit)


- Log -----------------------------------------------------------------
commit 06c6a2b4a3a6e64303caa256398dd2dc16f9c35a
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>

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

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 b1d9156..4dbd694 100644
--- a/ssl/d1_pkt.c
+++ b/ssl/d1_pkt.c
@@ -231,7 +231,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;