generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix free errors in ocsp utility.

Browse Source 
Keep copy of any host, path and port values allocated by
OCSP_parse_url and free as necessary.
(cherry picked from commit 5219d3dd350cc74498dd49daef5e6ee8c34d9857)
This commit is contained in:
Dr. Stephen Henson 2014-04-09 15:42:40 +01:00
parent a74bee5fc7
commit 3d8f4f23af
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
apps/ocsp.c
View File

@ -127,6 +127,7 @@ int MAIN(int argc, char **argv)
ENGINE *e = NULL; ENGINE *e = NULL;
char **args; char **args;
char *host = NULL, *port = NULL, *path = "/"; char *host = NULL, *port = NULL, *path = "/";
char *thost = NULL, *tport = NULL, *tpath = NULL;
char *reqin = NULL, *respin = NULL; char *reqin = NULL, *respin = NULL;
char *reqout = NULL, *respout = NULL; char *reqout = NULL, *respout = NULL;
char *signfile = NULL, *keyfile = NULL; char *signfile = NULL, *keyfile = NULL;
@ -204,6 +205,12 @@ int MAIN(int argc, char **argv)
} }
else if (!strcmp(*args, "-url")) else if (!strcmp(*args, "-url"))
{ {
if (thost)
OPENSSL_free(thost);
if (tport)
OPENSSL_free(tport);
if (tpath)
OPENSSL_free(tpath);
if (args[1]) if (args[1])
{ {
args++; args++;
@ -212,6 +219,9 @@ int MAIN(int argc, char **argv)
BIO_printf(bio_err, "Error parsing URL\n"); BIO_printf(bio_err, "Error parsing URL\n");
badarg = 1; badarg = 1;
} }
thost = host;
tport = port;
tpath = path;
} }
else badarg = 1; else badarg = 1;
} }
@ -920,12 +930,12 @@ end:
sk_X509_pop_free(verify_other, X509_free); sk_X509_pop_free(verify_other, X509_free);
sk_CONF_VALUE_pop_free(headers, X509V3_conf_free); sk_CONF_VALUE_pop_free(headers, X509V3_conf_free);
if (use_ssl != -1) if (thost)
{ OPENSSL_free(thost);
OPENSSL_free(host); if (tport)
OPENSSL_free(port); OPENSSL_free(tport);
OPENSSL_free(path); if (tpath)
} OPENSSL_free(tpath);
OPENSSL_EXIT(ret); OPENSSL_EXIT(ret);
} }