From: Pauli <paul.dale@oracle.com>
Date: Thu, 31 Aug 2017 22:56:54 +0000 (+1000)
Subject: Fix potential null problem.
X-Git-Tag: OpenSSL_1_1_1-pre1~709
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3907872f7234744b478499f42a8d151ca89be64d;p=oweals%2Fopenssl.git

Fix potential null problem.

Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4313)
---

diff --git a/crypto/aria/aria.c b/crypto/aria/aria.c
index a1903d9b2d..293bcc72bd 100644
--- a/crypto/aria/aria.c
+++ b/crypto/aria/aria.c
@@ -473,13 +473,13 @@ void aria_encrypt(const unsigned char *in, unsigned char *out,
 {
     register uint32_t reg0, reg1, reg2, reg3;
     int Nr;
-
-    const ARIA_u128 *rk = key->rd_key;
+    const ARIA_u128 *rk;
 
     if (in == NULL || out == NULL || key == NULL) {
         return;
     }
 
+    rk = key->rd_key;
     Nr = key->rounds;
 
     if (Nr != 12 && Nr != 14 && Nr != 16) {