1e7d0bafc6 — curl

Subject

curlx/fopen: replace open CRT functions their with `_s` counterparts (Windows)

Binary

No binary (build failed)

Architecture & Compiler Flags

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

Build Log

(log yok)

Commit Diff GitHub →

lib/curl_setup.h +2 -3 lib/curlx/fopen.c +13 -8 scripts/checksrc.pl +4 -0 tests/server/.checksrc +0 -1 tests/server/util.c +12 -4

lib/curl_setup.h+2 -3

@@ -95,10 +95,9 @@
	unlink(), etc. */
	#endif
	#ifndef _CRT_SECURE_NO_WARNINGS
-	#define _CRT_SECURE_NO_WARNINGS /* for _open(), _wfopen(), _wopen(), fopen(),
-	freopen(), getenv(), gmtime(), sprintf(),
+	#define _CRT_SECURE_NO_WARNINGS /* for getenv(), gmtime(), sprintf(),
	strcpy(),
-	in tests: localtime(), open(), sscanf() */
+	in tests: localtime(), sscanf() */
	#endif
	#endif /* _MSC_VER */

lib/curlx/fopen.c+13 -8

@@ -51,6 +51,8 @@ int curlx_fseek(void *stream, curl_off_t offset, int whence)

	#include "multibyte.h"

+	#include <share.h> /* for _SH_DENYNO */
+
	/* declare GetFullPathNameW for mingw-w64 UWP builds targeting old windows */
	#if defined(CURL_WINDOWS_UWP) && defined(__MINGW32__) && \
	(_WIN32_WINNT < _WIN32_WINNT_WIN10)
@@ -244,7 +246,7 @@ int curlx_win32_open(const char *filename, int oflag, ...)
	target = fixed;
	else
	target = filename_w;
-	result = _wopen(target, oflag, pmode);
+	errno = _wsopen_s(&result, target, oflag, _SH_DENYNO, pmode);
	curlx_unicodefree(filename_w);
	}
	else
@@ -255,7 +257,7 @@ int curlx_win32_open(const char *filename, int oflag, ...)
	target = fixed;
	else
	target = filename;
-	result = _open(target, oflag, pmode);
+	errno = _sopen_s(&result, target, oflag, _SH_DENYNO, pmode);
	#endif

	(free)(fixed);
@@ -276,7 +278,7 @@ FILE curlx_win32_fopen(const char filename, const char *mode)
	target = fixed;
	else
	target = filename_w;
-	result = _wfopen(target, mode_w);
+	errno = _wfopen_s(&result, target, mode_w);
	}
	else
	/* !checksrc! disable ERRNOVAR 1 */
@@ -288,14 +290,18 @@ FILE curlx_win32_fopen(const char filename, const char *mode)
	target = fixed;
	else
	target = filename;
-	/* !checksrc! disable BANNEDFUNC 1 */
-	result = fopen(target, mode);
+	errno = fopen_s(&result, target, mode);
	#endif

	(free)(fixed);
	return result;
	}

+	#if defined(__MINGW32__) && (__MINGW64_VERSION_MAJOR < 5)
+	_CRTIMP errno_t __cdecl freopen_s(FILE *file, const char filename,
+	const char mode, FILE stream);
+	#endif
+
	FILE curlx_win32_freopen(const char filename, const char mode, FILE fp)
	{
	FILE *result = NULL;
@@ -310,7 +316,7 @@ FILE curlx_win32_freopen(const char filename, const char mode, FILE fp)
	target = fixed;
	else
	target = filename_w;
-	result = _wfreopen(target, mode_w, fp);
+	errno = _wfreopen_s(&result, target, mode_w, fp);
	}
	else
	/* !checksrc! disable ERRNOVAR 1 */
@@ -322,8 +328,7 @@ FILE curlx_win32_freopen(const char filename, const char mode, FILE fp)
	target = fixed;
	else
	target = filename;
-	/* !checksrc! disable BANNEDFUNC 1 */
-	result = freopen(target, mode, fp);
+	errno = freopen_s(&result, target, mode, fp);
	#endif

	(free)(fixed);

scripts/checksrc.pl+4 -0

@@ -113,6 +113,10 @@ my %banfunc = (
	"fopen" => 1,
	"freopen" => 1,
	"open" => 1,
+	"_open" => 1,
+	"_wfopen" => 1,
+	"_wfreopen" => 1,
+	"_wopen" => 1,
	"stat" => 1,
	);

tests/server/.checksrc+0 -1

@@ -6,7 +6,6 @@ allowfunc accept
	allowfunc fprintf
	allowfunc freeaddrinfo
	allowfunc getaddrinfo
-	allowfunc open
	allowfunc printf
	allowfunc recv
	allowfunc send

tests/server/util.c+12 -4

@@ -27,6 +27,10 @@
	#include <fcntl.h>
	#endif

+	#ifdef _WIN32
+	#include <share.h>
+	#endif
+
	/* This function returns a pointer to STATIC memory. It converts the given
	* binary lump to a hex formatted string usable for output in logs or
	* whatever.
@@ -359,13 +363,17 @@ static void exit_signal_handler(int signum)
	(void)!write(STDERR_FILENO, msg, sizeof(msg) - 1);
	}
	else {
+	int fd = -1;
	#ifdef _WIN32
-	#define OPENMODE S_IREAD \| S_IWRITE
+	if(!_sopen_s(&fd, serverlogfile, O_WRONLY \| O_CREAT \| O_APPEND,
+	_SH_DENYNO, S_IREAD \| S_IWRITE) &&
+	fd != -1) {
	#else
-	#define OPENMODE S_IRUSR \| S_IWUSR
-	#endif
-	int fd = open(serverlogfile, O_WRONLY \| O_CREAT \| O_APPEND, OPENMODE);
+	/* !checksrc! disable BANNEDFUNC 1 */
+	fd = open(serverlogfile,
+	O_WRONLY \| O_CREAT \| O_APPEND, S_IRUSR \| S_IWUSR);
	if(fd != -1) {
+	#endif
	static const char msg[] = "exit_signal_handler: called\n";
	(void)!write(fd, msg, sizeof(msg) - 1);
	close(fd);