Skip to content

Conversation

@vszakats
Copy link
Member

@vszakats vszakats commented Sep 29, 2025

Turns out the signal handler on Windows still wasn't signal safe after
the previous round of fix. There is an open() call made from there,
and open happens to be unconditionally overridden via curl_setup.h
on Windows, to its local implementation (curlx_win32_open()), which
does memory allocations and potentially other things that are not signal
safe.

This is a temporary fix, till avoiding the override of system symbols
open and stat on Windows.

FTR this did not fix the CI 2304 errors, diskspace fail or job hangs due
to 0xC0000142 fork failure (it's rare all three occurs in the same run):
https://github.com/curl/curl/actions/runs/18110523584?pr=18774

Ref: #18634
Follow-up e95f509 #16852


  • do not override open and stat on Windows. Introduce
    curlx_open() and curlx_stat() instead.

Turns out the signal handler on Windows still wasn't signal safe after
the previous round of fix. There is an `open()` call made from there,
and `open` happens to be unconditionally overridden via `curl_setup.h`
on Windows, to a local implementation, which does memory allocations
and possibly other things that are not signal safe.

Ref: curl#18634
Follow-up e95f509 curl#16852
@vszakats vszakats added tests Windows Windows-specific labels Sep 29, 2025
@vszakats vszakats changed the title servers: drop open override in signal handler (Windows) servers: drop open() override in signal handler (Windows) Sep 29, 2025
@vszakats vszakats changed the title servers: drop open() override in signal handler (Windows) tests/server: drop open() override in signal handler (Windows) Sep 29, 2025
@vszakats vszakats changed the title tests/server: drop open() override in signal handler (Windows) tests/server: drop unsafe open() override in signal handler (Windows) Sep 29, 2025
@vszakats vszakats closed this in 10bac43 Sep 29, 2025
@vszakats vszakats deleted the s-open-override-in-signal-handler branch September 29, 2025 23:12
vszakats added a commit that referenced this pull request Sep 30, 2025
Replace them by `curlx_open()` and `curlx_stat()`.

To make it obvious in the source code what is being executed.

Also:
- tests/server: stop overriding `open()` for test servers.
  This is critical for the call made from the signal handler.
  For other calls, it's an option to use `curlx_open()`, but
  doesn't look important enough to do it, following the path
  taken with `fopen()`.

Follow-up to 10bac43 #18774
Follow-up to 20142f5 #18634
Follow-up to bf7375e #18503

Closes #18776
vszakats added a commit that referenced this pull request Nov 28, 2025
Before this patch curl used the C preprocessor to override standard
memory allocation symbols: malloc, calloc, strdup, realloc, free.
The goal of these is to replace them with curl's debug wrappers in
`CURLDEBUG` builds, another was to replace them with the wrappers
calling user-defined allocators in libcurl. This solution needed a bunch
of workarounds to avoid breaking external headers: it relied on include
order to do the overriding last. For "unity" builds it needed to reset
overrides before external includes. Also in test apps, which are always
built as single source files. It also needed the `(symbol)` trick
to avoid overrides in some places. This would still not fix cases where
the standard symbols were macros. It was also fragile and difficult
to figure out which was the actual function behind an alloc or free call
in a specific piece of code. This in turn caused bugs where the wrong
allocator was accidentally called.

To avoid these problems, this patch replaces this solution with
`curlx_`-prefixed allocator macros, and mapping them _once_ to either
the libcurl wrappers, the debug wrappers or the standard ones, matching
the rest of the code in libtests.

This concludes the long journey to avoid redefining standard functions
in the curl codebase.

Note: I did not update `packages/OS400/*.c` sources. They did not
`#include` `curl_setup.h`, `curl_memory.h` or `memdebug.h`, meaning
the overrides were never applied to them. This may or may not have been
correct. For now I suppressed the direct use of standard allocators
via a local `.checksrc`. Probably they (except for `curlcl.c`) should be
updated to include `curl_setup.h` and use the `curlx_` macros.

This patch changes mappings in two places:
- `lib/curl_threads.c` in libtests: Before this patch it mapped to
  libcurl allocators. After, it maps to standard allocators, like
  the rest of libtests code.
- `units`: before this patch it mapped to standard allocators. After, it
  maps to libcurl allocators.

Also:
- drop all position-dependent `curl_memory.h` and `memdebug.h` includes,
  and delete the now unnecessary headers.
- rename `Curl_tcsdup` macro to `curlx_tcsdup` and define like the other
  allocators.
- map `curlx_strdup()` to `_strdup()` on Windows (was: `strdup()`).
  To fix warnings silenced via `_CRT_NONSTDC_NO_DEPRECATE`.
- multibyte: map `curlx_convert_*()` to `_strdup()` on Windows
  (was: `strdup()`).
- src: do not reuse the `strdup` name for the local replacement.
- lib509: call `_strdup()` on Windows (was: `strdup()`).
- test1132: delete test obsoleted by this patch.
- CHECKSRC.md: update text for `SNPRINTF`.
- checksrc: ban standard allocator symbols.

Follow-up to b12da22 #18866
Follow-up to db98daa #18844
Follow-up to 4deea93 #18814
Follow-up to 9678ff5 #18776
Follow-up to 10bac43 #18774
Follow-up to 20142f5 #18634
Follow-up to bf7375e #18503
Follow-up to 9863599 #18502
Follow-up to 3bb5e58 #17827

Closes #19626
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

tests Windows Windows-specific

Development

Successfully merging this pull request may close these issues.

1 participant