summaryrefslogtreecommitdiffstats
path: root/crypto/dso
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2006-01-15 17:31:08 +0000
committerDr. Stephen Henson <steve@openssl.org>2006-01-15 17:31:08 +0000
commit9e9bececa9e9a89bf7b42a90c95b06eb3a2ee7a3 (patch)
tree17ca51c8ce8f62bd80627ec2f83d1a6852cc7bc2 /crypto/dso
parent90890074b0bf983bfd0f59b7571aa334faaef989 (diff)
Fix from stable branch.
Diffstat (limited to 'crypto/dso')
-rw-r--r--crypto/dso/dso_win32.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/dso/dso_win32.c b/crypto/dso/dso_win32.c
index 34b94b3d1d..d98a3e85f3 100644
--- a/crypto/dso/dso_win32.c
+++ b/crypto/dso/dso_win32.c
@@ -578,14 +578,14 @@ static char *win32_merger(DSO *dso, const char *filespec1, const char *filespec2
}
else
{
- filespec1_split = win32_splitter(dso, filespec1, 1);
+ filespec1_split = win32_splitter(dso, filespec1, 0);
if (!filespec1_split)
{
DSOerr(DSO_F_WIN32_MERGER,
ERR_R_MALLOC_FAILURE);
return(NULL);
}
- filespec2_split = win32_splitter(dso, filespec2, 0);
+ filespec2_split = win32_splitter(dso, filespec2, 1);
if (!filespec2_split)
{
DSOerr(DSO_F_WIN32_MERGER,