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, 2 deletions

diff --git a/src/lib/libcrypto/bio/bss_file.c b/src/lib/libcrypto/bio/bss_file.c
index acc746260e..6d5444f666 100644
--- a/src/lib/libcrypto/bio/bss_file.c
+++ b/src/lib/libcrypto/bio/bss_file.c
@@ -122,7 +122,7 @@ BIO_new_file(const char *filename, const char *mode)
 
         if (file == NULL) {
                 SYSerr(SYS_F_FOPEN, errno);
-                ERR_add_error_data(5, "fopen('", filename, "', '", mode, "')");
+                ERR_asprintf_error_data("fopen('%s', '%s')", filename, mode);
                 if (errno == ENOENT)
                         BIOerr(BIO_F_BIO_NEW_FILE, BIO_R_NO_SUCH_FILE);
                 else
@@ -262,7 +262,7 @@ file_ctrl(BIO *b, int cmd, long num, void *ptr)
                 fp = fopen(ptr, p);
                 if (fp == NULL) {
                         SYSerr(SYS_F_FOPEN, errno);
-                        ERR_add_error_data(5, "fopen('", ptr, "', '", p, "')");
+                        ERR_asprintf_error_data("fopen('%s', '%s')", ptr, p);
                         BIOerr(BIO_F_FILE_CTRL, ERR_R_SYS_LIB);
                         ret = 0;
                         break;