diff options
| author | marha <marha@users.sourceforge.net> | 2015-04-20 23:05:23 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2015-04-20 23:05:23 +0200 |
| commit | 0f7871ff824bcf064db3ab6bdfe26645ba6c8087 (patch) | |
| tree | 90d3d2b6112e083289c9cf68146852087814f6d3 /openssl/crypto/dso/dso_dlfcn.c | |
| parent | 934184bfecd402aae891b8740d788b486aa7269f (diff) | |
| parent | 2a00e489122f6c4b525090dbdba2855a2ea2d519 (diff) | |
| download | vcxsrv-0f7871ff824bcf064db3ab6bdfe26645ba6c8087.tar.gz vcxsrv-0f7871ff824bcf064db3ab6bdfe26645ba6c8087.tar.bz2 vcxsrv-0f7871ff824bcf064db3ab6bdfe26645ba6c8087.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
openssl/Makefile
Diffstat (limited to 'openssl/crypto/dso/dso_dlfcn.c')
| -rw-r--r-- | openssl/crypto/dso/dso_dlfcn.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/openssl/crypto/dso/dso_dlfcn.c b/openssl/crypto/dso/dso_dlfcn.c index c0fcbb18b..f629f0380 100644 --- a/openssl/crypto/dso/dso_dlfcn.c +++ b/openssl/crypto/dso/dso_dlfcn.c @@ -314,7 +314,7 @@ static char *dlfcn_merger(DSO *dso, const char *filespec1, return (NULL); } strcpy(merged, filespec2); - } else + } else { /* * This part isn't as trivial as it looks. It assumes that the * second file specification really is a directory, and makes no @@ -322,13 +322,12 @@ static char *dlfcn_merger(DSO *dso, const char *filespec1, * concatenation of filespec2 followed by a slash followed by * filespec1. */ - { int spec2len, len; spec2len = strlen(filespec2); - len = spec2len + (filespec1 ? strlen(filespec1) : 0); + len = spec2len + strlen(filespec1); - if (filespec2 && filespec2[spec2len - 1] == '/') { + if (spec2len && filespec2[spec2len - 1] == '/') { spec2len--; len--; } |