[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  519a5d1ef2ca3ba0adf0bc1d7dff984e8523d813 (commit)
      from  afe9bba749b9fd897b7e7d416d904852d867d2c2 (commit)


- Log -----------------------------------------------------------------
commit 519a5d1ef2ca3ba0adf0bc1d7dff984e8523d813
Author: Greg Zaverucha <gregz at microsoft.com>
Date:   Tue Jun 27 17:38:25 2017 -0700

    Fix sample code
    
    Fix memory leak in sample encryption code and check return value of
    fopen.
    
    CLA: trivial
    
    Signed-off-by: Greg Zaverucha <gregz at microsoft.com>
    
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/3790)

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

Summary of changes:
 doc/man3/EVP_EncryptInit.pod | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/man3/EVP_EncryptInit.pod b/doc/man3/EVP_EncryptInit.pod
index 46e6a57..66e1ffb 100644
--- a/doc/man3/EVP_EncryptInit.pod
+++ b/doc/man3/EVP_EncryptInit.pod
@@ -552,6 +552,7 @@ Encrypt a string using IDEA:
 
      if (!EVP_EncryptUpdate(ctx, outbuf, &outlen, intext, strlen(intext))) {
          /* Error */
+         EVP_CIPHER_CTX_free(ctx);
          return 0;
      }
      /*
@@ -560,6 +561,7 @@ Encrypt a string using IDEA:
       */
      if (!EVP_EncryptFinal_ex(ctx, outbuf + outlen, &tmplen)) {
          /* Error */
+         EVP_CIPHER_CTX_free(ctx);
          return 0;
      }
      outlen += tmplen;
@@ -571,6 +573,10 @@ Encrypt a string using IDEA:
       * NULs.
       */
      out = fopen(outfile, "wb");
+     if (out == NULL) {
+         /* Error */
+         return 0;
+     }
      fwrite(outbuf, 1, outlen, out);
      fclose(out);
      return 1;