X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=crypto%2Fdso%2Fdso_lib.c;h=49bdd7130976f254874f96bce0b2955995461d65;hb=ff095a8ac8096b06a206b76a699311a16805ff86;hp=e7ddfd5ecf799ef0352ecd4907d8c8ce89651edf;hpb=cbecb3ac3763f1179dc220a69d28e92f58e9443e;p=oweals%2Fopenssl.git

diff --git a/crypto/dso/dso_lib.c b/crypto/dso/dso_lib.c
index e7ddfd5ecf..49bdd71309 100644
--- a/crypto/dso/dso_lib.c
+++ b/crypto/dso/dso_lib.c
@@ -383,7 +383,7 @@ int DSO_set_filename(DSO *dso, const char *filename)
 		DSOerr(DSO_F_DSO_SET_FILENAME,ERR_R_MALLOC_FAILURE);
 		return(0);
 		}
-	strcpy(copied, filename);
+	BUF_strlcpy(copied, filename, strlen(filename) + 1);
 	if(dso->filename)
 		OPENSSL_free(dso->filename);
 	dso->filename = copied;
@@ -394,7 +394,7 @@ char *DSO_merge(DSO *dso, const char *filespec1, const char *filespec2)
 	{
 	char *result = NULL;
 
-	if(dso == NULL || dir == NULL)
+	if(dso == NULL || filespec1 == NULL)
 		{
 		DSOerr(DSO_F_DSO_MERGE,ERR_R_PASSED_NULL_PARAMETER);
 		return(NULL);
@@ -403,7 +403,7 @@ char *DSO_merge(DSO *dso, const char *filespec1, const char *filespec2)
 		filespec1 = dso->filename;
 	if(filespec1 == NULL)
 		{
-		DSOerr(DSO_F_DSO_MERGE,DSO_R_NO_FILENAME);
+		DSOerr(DSO_F_DSO_MERGE,DSO_R_NO_FILE_SPECIFICATION);
 		return(NULL);
 		}
 	if((dso->flags & DSO_FLAG_NO_NAME_TRANSLATION) == 0)
@@ -449,7 +449,7 @@ char *DSO_convert_filename(DSO *dso, const char *filename)
 					ERR_R_MALLOC_FAILURE);
 			return(NULL);
 			}
-		strcpy(result, filename);
+		BUF_strlcpy(result, filename, strlen(filename) + 1);
 		}
 	return(result);
 	}