From: Victor Julien <victor@inliniac.net>
Date: Tue, 20 Mar 2018 14:49:00 +0000 (+0100)
Subject: der: don't overwrite errcode
X-Git-Tag: suricata-4.1.0-beta1~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ba24bb82faa81d01ed00e4caa6262d6ce8013ffa;p=thirdparty%2Fsuricata.git

der: don't overwrite errcode

If the code has already been set it is more detailed than the more
generic 'invalid object'.
---

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;
     }