Replace all use of ERR_add_error_data with ERR_asprintf_error_data.

This avoids a lot of ugly gymnastics to do snprintfs before sending the
bag of strings to ERR, and eliminates at least one place in dso_dlfctn.c
where it was being called with the incorrect number of arguments and
using random things off the stack as addresses of strings.
ok krw@, jsing@

1 files changed, 2 insertions, 5 deletions

diff --git a/src/lib/libcrypto/asn1/a_mbstr.c b/src/lib/libcrypto/asn1/a_mbstr.c
index b59d84910f..9945ede2ac 100644
--- a/src/lib/libcrypto/asn1/a_mbstr.c
+++ b/src/lib/libcrypto/asn1/a_mbstr.c
@@ -98,7 +98,6 @@ ASN1_mbstring_ncopy(ASN1_STRING **out, const unsigned char *in, int len,
         ASN1_STRING *dest;
         unsigned char *p;
         int nchar;
-        char strbuf[32];
         int (*cpyfunc)(unsigned long, void *) = NULL;
 
         if (len == -1)
@@ -148,15 +147,13 @@ ASN1_mbstring_ncopy(ASN1_STRING **out, const unsigned char *in, int len,
 
         if ((minsize > 0) && (nchar < minsize)) {
                 ASN1err(ASN1_F_ASN1_MBSTRING_NCOPY, ASN1_R_STRING_TOO_SHORT);
-                snprintf(strbuf, sizeof strbuf, "%ld", minsize);
-                ERR_add_error_data(2, "minsize=", strbuf);
+                ERR_asprintf_error_data("minsize=%ld", minsize);
                 return -1;
         }
 
         if ((maxsize > 0) && (nchar > maxsize)) {
                 ASN1err(ASN1_F_ASN1_MBSTRING_NCOPY, ASN1_R_STRING_TOO_LONG);
-                snprintf(strbuf, sizeof strbuf, "%ld", maxsize);
-                ERR_add_error_data(2, "maxsize=", strbuf);
+                ERR_asprintf_error_data("maxsize=%ld", maxsize);
                 return -1;
         }