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, 4 insertions, 4 deletions

diff --git a/src/lib/libcrypto/x509v3/v3_alt.c b/src/lib/libcrypto/x509v3/v3_alt.c
index e61ed673c0..61b0c90fad 100644
--- a/src/lib/libcrypto/x509v3/v3_alt.c
+++ b/src/lib/libcrypto/x509v3/v3_alt.c
@@ -479,7 +479,7 @@ a2i_GENERAL_NAME(GENERAL_NAME *out, const X509V3_EXT_METHOD *method,
                         if (!(obj = OBJ_txt2obj(value, 0))) {
                                 X509V3err(X509V3_F_A2I_GENERAL_NAME,
                                     X509V3_R_BAD_OBJECT);
-                                ERR_add_error_data(2, "value=", value);
+                                ERR_asprintf_error_data("value=%s", value);
                                 goto err;
                         }
                         gen->d.rid = obj;
@@ -494,7 +494,7 @@ a2i_GENERAL_NAME(GENERAL_NAME *out, const X509V3_EXT_METHOD *method,
                 if (gen->d.ip == NULL) {
                         X509V3err(X509V3_F_A2I_GENERAL_NAME,
                             X509V3_R_BAD_IP_ADDRESS);
-                        ERR_add_error_data(2, "value=", value);
+                        ERR_asprintf_error_data("value=%s", value);
                         goto err;
                 }
                 break;
@@ -572,7 +572,7 @@ v2i_GENERAL_NAME_ex(GENERAL_NAME *out, const X509V3_EXT_METHOD *method,
         else {
                 X509V3err(X509V3_F_V2I_GENERAL_NAME_EX,
                     X509V3_R_UNSUPPORTED_OPTION);
-                ERR_add_error_data(2, "name=", name);
+                ERR_asprintf_error_data("name=%s", name);
                 return NULL;
         }
 
@@ -620,7 +620,7 @@ do_dirname(GENERAL_NAME *gen, char *value, X509V3_CTX *ctx)
         sk = X509V3_get_section(ctx, value);
         if (!sk) {
                 X509V3err(X509V3_F_DO_DIRNAME, X509V3_R_SECTION_NOT_FOUND);
-                ERR_add_error_data(2, "section=", value);
+                ERR_asprintf_error_data("section=%s", value);
                 X509_NAME_free(nm);
                 return 0;
         }