From: Matt Caswell <matt@openssl.org>
Date: Thu, 12 Mar 2015 11:25:03 +0000 (+0000)
Subject: Move malloc fail checks closer to malloc
X-Git-Tag: OpenSSL_1_0_1m~16
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d3554bff69d97b15fef063bdb0176a0b68021325;p=oweals%2Fopenssl.git

Move malloc fail checks closer to malloc

Move memory allocation failure checks closer to the site of the malloc in
dgst app. Only a problem if the debug flag is set...but still should be
fixed.

Reviewed-by: Tim Hudson <tjh@openssl.org>
(cherry picked from commit be1477adc97e76f4b83ed8075589f529069bd5d1)
---

diff --git a/apps/dgst.c b/apps/dgst.c
index 8459c19625..ad2f2348ac 100644
--- a/apps/dgst.c
+++ b/apps/dgst.c
@@ -287,6 +287,11 @@ int MAIN(int argc, char **argv)
 
     in = BIO_new(BIO_s_file());
     bmd = BIO_new(BIO_f_md());
+    if ((in == NULL) || (bmd == NULL)) {
+        ERR_print_errors(bio_err);
+        goto end;
+    }
+
     if (debug) {
         BIO_set_callback(in, BIO_debug_callback);
         /* needed for windows 3.1 */
@@ -298,11 +303,6 @@ int MAIN(int argc, char **argv)
         goto end;
     }
 
-    if ((in == NULL) || (bmd == NULL)) {
-        ERR_print_errors(bio_err);
-        goto end;
-    }
-
     if (out_bin == -1) {
         if (keyfile)
             out_bin = 1;