QuasarApp/openssl
4
0
Fork 0
mirror of https://github.com/QuasarApp/openssl.git synced 2025-05-14 10:29:42 +00:00
Code Issues Projects Releases Wiki Activity

GH762: Reuse strdup()

Browse Source 
Signed-off-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
Dmitry-Me 2016-02-29 11:55:13 +03:00 committed by Rich Salz
parent 1c03c81f52
commit edae9834b6
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crypto/dso/dso_lib.c
View File

@ -341,12 +341,11 @@ int DSO_set_filename(DSO *dso, const char *filename)
return (0); return (0);
} }
/* We'll duplicate filename */ /* We'll duplicate filename */
copied = OPENSSL_malloc(strlen(filename) + 1); copied = OPENSSL_strdup(filename);
if (copied == NULL) { if (copied == NULL) {
DSOerr(DSO_F_DSO_SET_FILENAME, ERR_R_MALLOC_FAILURE); DSOerr(DSO_F_DSO_SET_FILENAME, ERR_R_MALLOC_FAILURE);
return (0); return (0);
} }
OPENSSL_strlcpy(copied, filename, strlen(filename) + 1);
OPENSSL_free(dso->filename); OPENSSL_free(dso->filename);
dso->filename = copied; dso->filename = copied;
return (1); return (1);
@ -390,12 +389,11 @@ char *DSO_convert_filename(DSO *dso, const char *filename)
result = dso->meth->dso_name_converter(dso, filename); result = dso->meth->dso_name_converter(dso, filename);
} }
if (result == NULL) { if (result == NULL) {
result = OPENSSL_malloc(strlen(filename) + 1); result = OPENSSL_strdup(filename);
if (result == NULL) { if (result == NULL) {
DSOerr(DSO_F_DSO_CONVERT_FILENAME, ERR_R_MALLOC_FAILURE); DSOerr(DSO_F_DSO_CONVERT_FILENAME, ERR_R_MALLOC_FAILURE);
return (NULL); return (NULL);
} }
OPENSSL_strlcpy(result, filename, strlen(filename) + 1);
} }
return (result); return (result);
} }