From c971ca4c86b0a7bb4bb7a7d1a3c183b78dfbf144 Mon Sep 17 00:00:00 2001 From: Nils Larsch Date: Mon, 2 Apr 2007 20:02:27 +0000 Subject: [PATCH 1/1] check if pointer is != NULL before dereferencing it (Coverity CID 40) --- crypto/dso/dso_dlfcn.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/crypto/dso/dso_dlfcn.c b/crypto/dso/dso_dlfcn.c index f7c08973f4..979fca8065 100644 --- a/crypto/dso/dso_dlfcn.c +++ b/crypto/dso/dso_dlfcn.c @@ -296,13 +296,12 @@ static char *dlfcn_merger(DSO *dso, const char *filespec1, } /* If the first file specification is a rooted path, it rules. same goes if the second file specification is missing. */ - if (!filespec2 || filespec1[0] == '/') + if (!filespec2 || (filespec1 != NULL && filespec1[0] == '/')) { merged = OPENSSL_malloc(strlen(filespec1) + 1); if(!merged) { - DSOerr(DSO_F_DLFCN_MERGER, - ERR_R_MALLOC_FAILURE); + DSOerr(DSO_F_DLFCN_MERGER, ERR_R_MALLOC_FAILURE); return(NULL); } strcpy(merged, filespec1); -- 2.34.1