Merge pull request #8 from kosmas-valianos/calloc

kosmas-valianos · web-flow · commit 23836d886514 · 2022-03-21T17:09:39.000+01:00
Use calloc() when allocating tlv_array so that *tlvs is set to NULL
diff --git a/src/proxy_protocol.c b/src/proxy_protocol.c
@@ -682,7 +682,7 @@ static int32_t pp2_parse_hdr(uint8_t *pkt, uint32_t pktlen, pp_info_t *pp_info)
     /* Any TLV vector must be at least 3 bytes */
     if (tlv_vectors_len > 3)
     {
-        pp_info->tlv_array = malloc(sizeof(*pp_info->tlv_array));
+        pp_info->tlv_array = calloc(1, sizeof(*pp_info->tlv_array));
     }
     while (tlv_vectors_len > 3)
     {

Original file line number	Diff line number	Diff line change
`@@ -682,7 +682,7 @@ static int32_t pp2_parse_hdr(uint8_t pkt, uint32_t pktlen, pp_info_t pp_info)`
`682`	`682`	`/* Any TLV vector must be at least 3 bytes */`
`683`	`683`	`if (tlv_vectors_len > 3)`
`684`	`684`	`{`
`685`		`- pp_info->tlv_array = malloc(sizeof(*pp_info->tlv_array));`
	`685`	`+ pp_info->tlv_array = calloc(1, sizeof(*pp_info->tlv_array));`
`686`	`686`	`}`
`687`	`687`	`while (tlv_vectors_len > 3)`
`688`	`688`	`{`