Merge pull request #562 from simo5/rc4doublefree

Prevent double free of RC4 context
cyrusimap · Apr 17, 2019 · 284be6f · 284be6f
2 parents 9c4ee5d + ca6c587
commit 284be6f
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/plugins/digestmd5.c b/plugins/digestmd5.c
@@ -1224,8 +1224,14 @@ static void free_rc4(context_t *text)
 {
     /* free rc4 context structures */
 
-    if(text->cipher_enc_context) text->utils->free(text->cipher_enc_context);
-    if(text->cipher_dec_context) text->utils->free(text->cipher_dec_context);
+    if (text->cipher_enc_context) {
+        text->utils->free(text->cipher_enc_context);
+        text->cipher_enc_context = NULL;
+    }
+    if (text->cipher_dec_context) {
+        text->utils->free(text->cipher_dec_context);
+        text->cipher_dec_context = NULL;
+    }
 }
 
 static int init_rc4(context_t *text,