Fix old bug in contrib/sslinfo: X509_NAME_to_text freed the BIO_s_mem buffer

it was using too soon.  In a situation where pg_do_encoding_conversion is
a no-op, this led to garbage data returned.

In HEAD, also modify the code that's ensuring null termination to make it
a tad more obvious what's happening.

diff --git a/contrib/sslinfo/sslinfo.c b/contrib/sslinfo/sslinfo.c
index e103b023052ab96bd3ab5f8ac15318f6e88181b1..62c3e3c6dafaae5b56afe4981d82d5086723819d 100644 (file)
--- a/contrib/sslinfo/sslinfo.c
+++ b/contrib/sslinfo/sslinfo.c
@@ -312,19 +312,14 @@ X509_NAME_to_text(X509_NAME *name)
                                                                                        size - 1,
                                                                                        PG_UTF8,
                                                                                        GetDatabaseEncoding());
-       BIO_free(membuf);
-
        outlen = strlen(dp);
        result = palloc(VARHDRSZ + outlen);
        memcpy(VARDATA(result), dp, outlen);
        SET_VARSIZE(result, VARHDRSZ + outlen);
 
-       /*
-        * pg_do_encoding_conversion has annoying habit of returning source
-        * pointer
-        */
        if (dp != sp)
                pfree(dp);
+       BIO_free(membuf);
 
        PG_RETURN_TEXT_P(result);
 }