Skip to content

fix(curl): statically initialize linked function table #2015

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jpnurmi merged 2 commits into from
Aug 25, 2026
Merged

fix(curl): statically initialize linked function table #2015

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f8bc386
fix(curl): Statically initialize linked function table
jpnurmi Aug 24, 2026
299e8a9
Update CHANGELOG.md
jpnurmi Aug 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
- Wine: fix OS version detection and cross-compiling Windows builds from Linux. ([#2001](https://github.com/getsentry/sentry-native/pull/2001))
- Destroy condition variables as approriate when no longer needed. ([#2004](https://github.com/getsentry/sentry-native/pull/2004))
- Crashpad/Windows: preserve module CodeView UUIDs for minimal PDB70 records with empty PDB filenames. ([#2003](https://github.com/getsentry/sentry-native/pull/2003))
- Prevent a race between SDK reinitialization and cleanup of the previous curl client when libcurl is linked directly. ([#2015](https://github.com/getsentry/sentry-native/pull/2015))

## 0.16.3

Expand Down
30 changes: 17 additions & 13 deletions src/transports/sentry_http_transport_curl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,24 @@ typedef struct {
void (*slist_free_all)(struct curl_slist *list);
} curl_table_t;

#ifdef SENTRY_LINK_CURL
static const curl_table_t g_curl = {
.global_init = curl_global_init,
.version_info = curl_version_info,
.global_cleanup = curl_global_cleanup,
.easy_init = curl_easy_init,
.easy_cleanup = curl_easy_cleanup,
.easy_reset = curl_easy_reset,
.easy_setopt = curl_easy_setopt,
.easy_getinfo = curl_easy_getinfo,
.easy_perform = curl_easy_perform,
.easy_strerror = curl_easy_strerror,
.slist_append = curl_slist_append,
.slist_free_all = curl_slist_free_all,
};
#else
static curl_table_t g_curl;
#endif

#ifndef SENTRY_LINK_CURL
static void
Expand Down Expand Up @@ -165,19 +182,6 @@ curl_load(void)
static int
curl_load(void)
{
g_curl.global_init = curl_global_init;
g_curl.version_info = curl_version_info;
g_curl.global_cleanup = curl_global_cleanup;
g_curl.easy_init = curl_easy_init;
g_curl.easy_cleanup = curl_easy_cleanup;
g_curl.easy_reset = curl_easy_reset;
g_curl.easy_setopt = curl_easy_setopt;
g_curl.easy_getinfo = curl_easy_getinfo;
g_curl.easy_perform = curl_easy_perform;
g_curl.easy_strerror = curl_easy_strerror;
g_curl.slist_append = curl_slist_append;
g_curl.slist_free_all = curl_slist_free_all;

return 0;
}
#endif
Expand Down
Loading