]> git.ipfire.org Git - thirdparty/suricata.git/commitdiff
der: don't overwrite errcode 3297/head
authorVictor Julien <victor@inliniac.net>
Tue, 20 Mar 2018 14:49:00 +0000 (15:49 +0100)
committerVictor Julien <victor@inliniac.net>
Tue, 20 Mar 2018 15:27:22 +0000 (16:27 +0100)
If the code has already been set it is more detailed than the more
generic 'invalid object'.

src/util-decode-der.c

index 2d57d416adfcc4c808a88d8925c28dc5ab6ed572..53fab0edf02ccf3168b4ed1a75ef3e5904d6e550 100644 (file)
@@ -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;
     }