Skip to content

Fix allocator mismatch ech knownhosts#21150

Closed
MarkLee131 wants to merge 4 commits intocurl:masterfrom
MarkLee131:fix-allocator-mismatch-ech-knownhosts
Closed

Fix allocator mismatch ech knownhosts#21150
MarkLee131 wants to merge 4 commits intocurl:masterfrom
MarkLee131:fix-allocator-mismatch-ech-knownhosts

Conversation

@MarkLee131
Copy link
Copy Markdown
Contributor

@MarkLee131 MarkLee131 commented Mar 29, 2026

Fix #21149

@MarkLee131
tool: fix two more allocator mismatches
54f05d7 
memory allocated by libcurl (curl_maprintf) must be freed with
curl_free(), and memory allocated by the tool (curlx_strdup via
findfile) must be freed with curlx_free().

- tool_cfgable: ech_config is allocated with curl_maprintf, free it
  with curl_free() instead of tool_safefree()
- config2setopts: known hosts from findfile() is allocated with
  curlx_strdup, free it with curlx_free() instead of curl_free()
- tool_findfile: fix comment to say curlx_free() instead of curl_free()

Follow-up to b71973c
@MarkLee131
Merge branch 'curl:master' into fix-allocator-mismatch-ech-knownhosts
907b94f
bagder
bagder reviewed Mar 29, 2026
View reviewed changes
bagder
bagder reviewed Mar 29, 2026
View reviewed changes
bagder
bagder reviewed Mar 29, 2026
View reviewed changes
Copy link
Copy Markdown
Member

@bagder bagder left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! It needs some minor adjustments though

@MarkLee131
Merge branch 'curl:master' into fix-allocator-mismatch-ech-knownhosts
5d73d7e
@MarkLee131
tool: use curlx_strdup to ensure consistent tool-memory allocation
5ccaeed 
For knownhosts, curlx_strdup() the findfile() result so that
config->knownhosts always uses tool-memory.

For ech_config, curlx_strdup() the curl_maprintf() result so that
config->ech_config always uses tool-memory, matching the getstr() path.
@MarkLee131
Copy link
Copy Markdown
Contributor Author

MarkLee131 commented Mar 30, 2026

Thanks for the review.
Updated: now using curlx_strdup() on both the findfile() result for knownhosts and the curl_maprintf() result for ech_config, so both pointers consistently use tool-memory throughout. Also reverted the findfile() comment and tool_cfgable.c back to tool_safefree accordingly.

@bagder bagder closed this in 9fcc7e4 Mar 30, 2026
@bagder
Copy link
Copy Markdown
Member

bagder commented Mar 30, 2026

Thanks!

@bagder bagder mentioned this pull request Mar 30, 2026
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@bagder bagder bagder approved these changes

Assignees

No one assigned

Labels

cmdline tool

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Two more allocator mismatches in the curl tool (same class as b71973c115)

2 participants

@MarkLee131 @bagder