From: Greg Zaverucha <gregz@microsoft.com>
Date: Wed, 28 Jun 2017 00:38:25 +0000 (-0700)
Subject: Fix sample code
X-Git-Tag: OpenSSL_1_1_1-pre1~1184
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=519a5d1ef2ca3ba0adf0bc1d7dff984e8523d813;p=oweals%2Fopenssl.git

Fix sample code

Fix memory leak in sample encryption code and check return value of
fopen.

CLA: trivial

Signed-off-by: Greg Zaverucha <gregz@microsoft.com>

Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3790)
---

diff --git a/doc/man3/EVP_EncryptInit.pod b/doc/man3/EVP_EncryptInit.pod
index 46e6a57d4b..66e1ffb688 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;