@@ -315,7 +315,6 @@ x509_get_subject(X509 *cert, struct gc_arena *gc)

     BIO *subject_bio = NULL;

     BUF_MEM *subject_mem;

     char *subject = NULL;

-    int maxlen = 0;

     /*

      * Generate the subject string in OpenSSL proprietary format,

@@ -346,11 +345,10 @@ x509_get_subject(X509 *cert, struct gc_arena *gc)

     BIO_get_mem_ptr(subject_bio, &subject_mem);

-    maxlen = subject_mem->length + 1;

-    subject = gc_malloc(maxlen, false, gc);

+    subject = gc_malloc(subject_mem->length + 1, false, gc);

-    memcpy(subject, subject_mem->data, maxlen);

-    subject[maxlen - 1] = '\0';

+    memcpy(subject, subject_mem->data, subject_mem->length);

+    subject[subject_mem->length] = '\0';

 err:

     if (subject_bio)