Commit c971ca4c authored by Nils Larsch's avatar Nils Larsch
Browse files

check if pointer is != NULL before dereferencing it (Coverity CID 40)

parent 9babf392

crypto/dso/dso_dlfcn.c

+2 −3
Original line number Diff line number Diff line
@@ -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);