From: Victor Julien <victor@inliniac.net>
Date: Thu, 17 Dec 2015 12:25:02 +0000 (+0100)
Subject: DER decoder: don't use strlcpy on non-strings
X-Git-Tag: suricata-3.0RC3~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2fbfd6efcca95469246338d4eeba69f31f4224df;p=thirdparty%2Fsuricata.git

DER decoder: don't use strlcpy on non-strings
---

diff --git a/src/util-decode-der.c b/src/util-decode-der.c
index 1687668bd5..05c4671ad8 100644
--- a/src/util-decode-der.c
+++ b/src/util-decode-der.c
@@ -482,7 +482,8 @@ static Asn1Generic * DecodeAsn1DerIA5String(const unsigned char *buffer, uint32_
         SCFree(a);
         return NULL;
     }
-    strlcpy(a->str, (const char*)d_ptr, length+1);
+    memcpy(a->str, (const char*)d_ptr, length);
+    a->str[length] = 0;
 
     d_ptr += length;
 
@@ -583,8 +584,8 @@ static Asn1Generic * DecodeAsn1DerPrintableString(const unsigned char *buffer, u
         SCFree(a);
         return NULL;
     }
-    strlcpy(a->str, (const char*)d_ptr, length+1);
-    a->str[length] = '\0';
+    memcpy(a->str, (const char*)d_ptr, length);
+    a->str[length] = 0;
 
     d_ptr += length;