1 files changed, 10 insertions, 9 deletions

diff --git a/src/lib/libcrypto/asn1/a_bytes.c b/src/lib/libcrypto/asn1/a_bytes.c
index e452e03b88..8cde695804 100644
--- a/src/lib/libcrypto/asn1/a_bytes.c
+++ b/src/lib/libcrypto/asn1/a_bytes.c
@@ -71,7 +71,7 @@ B_ASN1_T61STRING,B_ASN1_VIDEOTEXSTRING,B_ASN1_IA5STRING,0,
 B_ASN1_UNIVERSALSTRING,B_ASN1_UNKNOWN,B_ASN1_BMPSTRING,B_ASN1_UNKNOWN,
         };
 
-static int asn1_collate_primative(ASN1_STRING *a, ASN1_CTX *c);
+static int asn1_collate_primitive(ASN1_STRING *a, ASN1_CTX *c);
 /* type is a 'bitmap' of acceptable string types.
  */
 ASN1_STRING *d2i_ASN1_type_bytes(ASN1_STRING **a, unsigned char **pp,
@@ -124,7 +124,7 @@ ASN1_STRING *d2i_ASN1_type_bytes(ASN1_STRING **a, unsigned char **pp,
         else
                 s=NULL;
 
-        if (ret->data != NULL) Free((char *)ret->data);
+        if (ret->data != NULL) Free(ret->data);
         ret->length=(int)len;
         ret->data=s;
         ret->type=tag;
@@ -205,7 +205,7 @@ ASN1_STRING *d2i_ASN1_bytes(ASN1_STRING **a, unsigned char **pp, long length,
                 c.tag=Ptag;
                 c.xclass=Pclass;
                 c.max=(length == 0)?0:(p+length);
-                if (!asn1_collate_primative(ret,&c)) 
+                if (!asn1_collate_primitive(ret,&c)) 
                         goto err; 
                 else
                         {
@@ -218,8 +218,8 @@ ASN1_STRING *d2i_ASN1_bytes(ASN1_STRING **a, unsigned char **pp, long length,
                         {
                         if ((ret->length < len) || (ret->data == NULL))
                                 {
-                                if (ret->data != NULL) Free((char *)ret->data);
-                                s=(unsigned char *)Malloc((int)len);
+                                if (ret->data != NULL) Free(ret->data);
+                                s=(unsigned char *)Malloc((int)len + 1);
                                 if (s == NULL)
                                         {
                                         i=ERR_R_MALLOC_FAILURE;
@@ -229,12 +229,13 @@ ASN1_STRING *d2i_ASN1_bytes(ASN1_STRING **a, unsigned char **pp, long length,
                         else
                                 s=ret->data;
                         memcpy(s,p,(int)len);
+                        s[len] = '\0';
                         p+=len;
                         }
                 else
                         {
                         s=NULL;
-                        if (ret->data != NULL) Free((char *)ret->data);
+                        if (ret->data != NULL) Free(ret->data);
                         }
 
                 ret->length=(int)len;
@@ -253,11 +254,11 @@ err:
         }
 
 
-/* We are about to parse 0..n d2i_ASN1_bytes objects, we are to collapes
- * them into the one struture that is then returned */
+/* We are about to parse 0..n d2i_ASN1_bytes objects, we are to collapse
+ * them into the one structure that is then returned */
 /* There have been a few bug fixes for this function from
  * Paul Keogh <paul.keogh@sse.ie>, many thanks to him */
-static int asn1_collate_primative(ASN1_STRING *a, ASN1_CTX *c)
+static int asn1_collate_primitive(ASN1_STRING *a, ASN1_CTX *c)
         {
         ASN1_STRING *os=NULL;
         BUF_MEM b;