[openssl-commits] [openssl] master update

[paul.dale at oracle.com]

The branch master has been updated
       via  43a0449fe6ce18b750803be8a115a412a7235496 (commit)
      from  5ecff87d666f47d0003b106c61ada1e25655b81d (commit)


- Log -----------------------------------------------------------------
commit 43a0449fe6ce18b750803be8a115a412a7235496
Author: Pauli <paul.dale at oracle.com>
Date:   Tue Jul 4 09:56:05 2017 +1000

    Use the return value from write(2)
    This prevents a warning when building with crypto-mdebug.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/3836)

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

Summary of changes:
 crypto/mem.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/crypto/mem.c b/crypto/mem.c
index aa5ac56..81a73cc 100644
--- a/crypto/mem.c
+++ b/crypto/mem.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -126,13 +126,16 @@ static int shouldfail(void)
 {
     int roll = (int)(random() % 100);
     int shoulditfail = roll < md_fail_percent;
+    int len;
     char buff[80];
 
     if (md_tracefd > 0) {
         BIO_snprintf(buff, sizeof(buff),
                      "%c C%ld %%%d R%d\n",
                      shoulditfail ? '-' : '+', md_count, md_fail_percent, roll);
-        write(md_tracefd, buff, strlen(buff));
+        len = strlen(buff);
+        if (write(md_tracefd, buff, len) != len)
+            perror("shouldfail write failed");
 #ifndef OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE
         if (shoulditfail) {
             void *addrs[30];