romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-03 10:20:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

tool_paramhlp: remove a malloc+free from proto2num()

Browse source 
Closes #20120
This commit is contained in:
Daniel Stenberg 2025-12-31 00:13:24 +01:00
parent bfa5857c44
commit 0c278cd586
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/tool_paramhlp.c
View file

@ -396,21 +396,23 @@ static void protoset_clear(const char **protoset, const char *proto)
* data.
*/
#define MAX_PROTOSTRING (64 * 11) /* Room for 64 10-chars proto names. */
#define MAX_PROTOS 34
#define MAX_PROTOSTRING (MAX_PROTOS * 11) /* Room for MAX_PROTOS number of
10-chars proto names. */
ParameterError proto2num(const char * const *val, char **ostr, const char *str)
{
const char **protoset;
struct dynbuf obuf;
size_t proto;
CURLcode result = CURLE_OK;
const char *protoset[MAX_PROTOS + 1];
DEBUGASSERT(proto_count <= MAX_PROTOS);
if(proto_count > MAX_PROTOS) /* if case of surprises */
return PARAM_NO_MEM;
curlx_dyn_init(&obuf, MAX_PROTOSTRING);
protoset = curlx_malloc((proto_count + 1) * sizeof(*protoset));
if(!protoset)
return PARAM_NO_MEM;
/* Preset protocol set with default values. */
protoset[0] = NULL;
for(; *val; val++) {
@ -505,7 +507,6 @@ ParameterError proto2num(const char * const *val, char **ostr, const char *str)
for(proto = 0; protoset[proto] && !result; proto++)
result = curlx_dyn_addf(&obuf, "%s%s", curlx_dyn_len(&obuf) ? "," : "",
protoset[proto]);
curlx_free((char *)protoset);
if(result)
return PARAM_NO_MEM;
if(!curlx_dyn_len(&obuf)) {