summaryrefslogtreecommitdiffstats
path: root/crypto/dso
diff options
context:
space:
mode:
authorGeoff Thorpe <geoff@openssl.org>2000-10-30 18:47:27 +0000
committerGeoff Thorpe <geoff@openssl.org>2000-10-30 18:47:27 +0000
commit7d09713d09f41778c92913d57a877a4eb1aebbfc (patch)
treefbcadffbff51db57e8edb85bb1e1cdc5144064dc /crypto/dso
parent3aba98e787b11b3e20709c00bf40b08ad1effd49 (diff)
DSO_load() should also work when it is passed a NULL - a new DSO is created
automatically, however some code was still referring to the original pointer rather than the internal one (and thus to NULL instead of the created pointer).
Diffstat (limited to 'crypto/dso')
-rw-r--r--crypto/dso/dso_lib.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/dso/dso_lib.c b/crypto/dso/dso_lib.c
index 0202978fd8..364ddbdb37 100644
--- a/crypto/dso/dso_lib.c
+++ b/crypto/dso/dso_lib.c
@@ -209,7 +209,7 @@ DSO *DSO_load(DSO *dso, const char *filename, DSO_METHOD *meth, int flags)
else
ret = dso;
/* Don't load if we're currently already loaded */
- if(dso->filename != NULL)
+ if(ret->filename != NULL)
{
DSOerr(DSO_F_DSO_LOAD,DSO_R_DSO_ALREADY_LOADED);
goto err;
@@ -217,12 +217,12 @@ DSO *DSO_load(DSO *dso, const char *filename, DSO_METHOD *meth, int flags)
/* filename can only be NULL if we were passed a dso that already has
* one set. */
if(filename != NULL)
- if(!DSO_set_filename(dso, filename))
+ if(!DSO_set_filename(ret, filename))
{
DSOerr(DSO_F_DSO_LOAD,DSO_R_SET_FILENAME_FAILED);
goto err;
}
- filename = dso->filename;
+ filename = ret->filename;
if(filename == NULL)
{
DSOerr(DSO_F_DSO_LOAD,DSO_R_NO_FILENAME);