From ba24bb82faa81d01ed00e4caa6262d6ce8013ffa Mon Sep 17 00:00:00 2001
From: Victor Julien <victor@inliniac.net>
Date: Tue, 20 Mar 2018 15:49:00 +0100
Subject: [PATCH] der: don't overwrite errcode

If the code has already been set it is more detailed than the more
generic 'invalid object'.
---
 src/util-decode-der.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/util-decode-der.c b/src/util-decode-der.c
index 2d57d416ad..53fab0edf0 100644
--- a/src/util-decode-der.c
+++ b/src/util-decode-der.c
@@ -290,7 +290,8 @@ static Asn1Generic * DecodeAsn1DerGeneric(const unsigned char *buffer,
     };
 
     if (child == NULL) {
-        *errcode = ERR_DER_INVALID_OBJECT;
+        if (*errcode == 0)
+            *errcode = ERR_DER_INVALID_OBJECT;
         return NULL;
     }
 
-- 
2.47.2