romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-04-14 22:01:41 +03:00
Code Issues Projects Releases Packages Wiki Activity

windows: fix to preserve error code in curlx_winapi_strerror()

Browse source 
Drop the interim macro `PRESERVE_WINDOWS_ERROR_CODE` and always preserve
error code for `_WIN32`. To make sure this is always done in
`curlx_winapi_strerror()`.

Follow-up to c74d3e10d2 #17299

Closes #17302
This commit is contained in:
Viktor Szakats 2025-05-09 15:18:51 +02:00
parent d4dd43b20d
commit 1499319442
No known key found for this signature in database
GPG key ID: B5ABD165E2AEF201
2 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/curlx/winapi.c
View file

@ -90,7 +90,7 @@ const char *curlx_get_winapi_error(int err, char *buf, size_t buflen)
const char *curlx_winapi_strerror(DWORD err, char *buf, size_t buflen)
{
#ifdef PRESERVE_WINDOWS_ERROR_CODE
#ifdef _WIN32
DWORD old_win_err = GetLastError();
#endif
int old_errno = errno;
@ -125,7 +125,7 @@ const char *curlx_winapi_strerror(DWORD err, char *buf, size_t buflen)
if(errno != old_errno)
CURL_SETERRNO(old_errno);
#ifdef PRESERVE_WINDOWS_ERROR_CODE
#ifdef _WIN32
if(old_win_err != GetLastError())
SetLastError(old_win_err);
#endif

12
lib/strerror.c
View file

@ -49,10 +49,6 @@
#include "curl_memory.h"
#include "memdebug.h"
#ifdef _WIN32
#define PRESERVE_WINDOWS_ERROR_CODE
#endif
const char *
curl_easy_strerror(CURLcode error)
{
@ -804,7 +800,7 @@ get_winsock_error(int err, char *buf, size_t len)
*/
const char *Curl_strerror(int err, char *buf, size_t buflen)
{
#ifdef PRESERVE_WINDOWS_ERROR_CODE
#ifdef _WIN32
DWORD old_win_err = GetLastError();
#endif
int old_errno = errno;
@ -884,7 +880,7 @@ const char *Curl_strerror(int err, char *buf, size_t buflen)
if(errno != old_errno)
CURL_SETERRNO(old_errno);
#ifdef PRESERVE_WINDOWS_ERROR_CODE
#ifdef _WIN32
if(old_win_err != GetLastError())
SetLastError(old_win_err);
#endif
@ -899,7 +895,7 @@ const char *Curl_strerror(int err, char *buf, size_t buflen)
*/
const char *Curl_sspi_strerror(int err, char *buf, size_t buflen)
{
#ifdef PRESERVE_WINDOWS_ERROR_CODE
#ifdef _WIN32
DWORD old_win_err = GetLastError();
#endif
int old_errno = errno;
@ -1032,7 +1028,7 @@ const char *Curl_sspi_strerror(int err, char *buf, size_t buflen)
if(errno != old_errno)
CURL_SETERRNO(old_errno);
#ifdef PRESERVE_WINDOWS_ERROR_CODE
#ifdef _WIN32
if(old_win_err != GetLastError())
SetLastError(old_win_err);
#endif