mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-06 23:27:04 +02:00
Code Issues Projects Releases Wiki Activity

CLEANUP: ocsp: do no use strpcy() to copy a path!

Browse Source 
strcpy() is quite nasty but tolerable to copy constants, but here
it copies a variable path into a node in a code path that's not
trivial to follow given that it takes the node as the result of
a tree lookup. Let's get rid of it and mention where the entry
is retrieved.
This commit is contained in:
Willy Tarreau 2023-04-07 17:49:37 +02:00
parent a0fa577070
commit 6d4c0c2ca2
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/ssl_sock.c
View File

@ -1119,7 +1119,7 @@ static int ssl_sock_load_ocsp(const char *path, SSL_CTX *ctx, struct ckch_data *
#endif #endif
struct buffer *ocsp_uri = get_trash_chunk(); struct buffer *ocsp_uri = get_trash_chunk();
char *err = NULL; char *err = NULL;
size_t path_len;
x = data->cert; x = data->cert;
if (!x) if (!x)
@ -1164,7 +1164,8 @@ static int ssl_sock_load_ocsp(const char *path, SSL_CTX *ctx, struct ckch_data *
if (!i || (i > OCSP_MAX_CERTID_ASN1_LENGTH)) if (!i || (i > OCSP_MAX_CERTID_ASN1_LENGTH))
goto out; goto out;
ocsp = calloc(1, sizeof(*ocsp)+strlen(path)+1); path_len = strlen(path);
ocsp = calloc(1, sizeof(*ocsp) + path_len + 1);
if (!ocsp) if (!ocsp)
goto out; goto out;
@ -1265,7 +1266,13 @@ static int ssl_sock_load_ocsp(const char *path, SSL_CTX *ctx, struct ckch_data *
goto out; goto out;
} }
strcpy(iocsp->path, path); /* Note: if we arrive here, ocsp==NULL because iocsp==ocsp
* after the ebmb_insert(), which indicates that we've
* just inserted this new node and that it's the one for
* which we previously allocated enough room for path_len+1
* chars.
*/
memcpy(iocsp->path, path, path_len + 1);
if (data->ocsp_update_mode == SSL_SOCK_OCSP_UPDATE_ON) { if (data->ocsp_update_mode == SSL_SOCK_OCSP_UPDATE_ON) {
ssl_ocsp_update_insert(iocsp); ssl_ocsp_update_insert(iocsp);