Commit 526228b7 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Update from 1.0.0-stable.

parent 34d01a3b

crypto/dso/dso_win32.c

+3 −0
Original line number Diff line number Diff line
@@ -347,6 +347,7 @@ static struct file_st *win32_splitter(DSO *dso, const char *filename, 
				DSOerr(DSO_F_WIN32_SPLITTER,

					DSO_R_INCORRECT_FILE_SYNTAX);

				/*goto err;*/

				OPENSSL_free(result);

				return(NULL);

				}

			result->device = start;
@@ -613,6 +614,8 @@ static char *win32_merger(DSO *dso, const char *filespec1, const char *filespec2 


		merged = win32_joiner(dso, filespec1_split);

		}

	OPENSSL_free(filespec1_split);

	OPENSSL_free(filespec2_split);

	return(merged);

	}