From 35919a01caf4a84c204eec0c18720b6efc07bb6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= <joao.valverde@tecnico.ulisboa.pt>
Date: Thu, 11 Feb 2016 15:55:36 +0000
Subject: AES: Fix dereference of null pointer

Change-Id: Iddd21c8786e679eef51024a172403200ee6652cb
Reviewed-on: https://code.wireshark.org/review/13902
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
---
 wsutil/aes.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'wsutil')

diff --git a/wsutil/aes.c b/wsutil/aes.c
index ee910c2b64..fdd5b89896 100644
--- a/wsutil/aes.c
+++ b/wsutil/aes.c
@@ -1258,7 +1258,10 @@ void rijndael_decrypt(
  */
 void aes_cmac_encrypt_starts(aes_cmac_ctx *ctx, const guint8 *key, guint key_len)
 {
-	if (ctx == NULL || key == NULL) {
+	if (ctx == NULL) {
+		return;
+	}
+	if (key == NULL) {
 		ctx->key_len = 0;
 		return;
 	}
-- 
cgit v1.2.3