luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-24 03:02:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

fileutils.c: Fix the clearfd test on Windows

Browse Source 
...when the test program aborts while checking the FD's were indeed
closed, since we need to override the invalid parameter handler to do
such checks, if the CRT demands so, so that the test program will
proceed normally.

This will fix issue #2800.
This commit is contained in:
Chun-wei Fan 2022-11-01 13:14:40 +08:00
parent 9bcc9405d7
commit 4f426c56d0
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
glib/tests/fileutils.c
View File

@ -35,6 +35,7 @@
/* Test our stdio wrappers here; this disables redefining (e.g.) g_open() to open() */
#define G_STDIO_WRAP_ON_UNIX
#include <glib/gstdio.h>
#include "glib-private.h"
#ifdef G_OS_UNIX
#include <unistd.h>
@ -2462,8 +2463,13 @@ assert_fd_was_closed (int fd)
* was still valid */
if (g_test_undefined ())
{
int result = g_fsync (fd);
int errsv = errno;
int result, errsv;
GWin32InvalidParameterHandler handler;
GLIB_PRIVATE_CALL (g_win32_push_empty_invalid_parameter_handler) (&handler);
result = g_fsync (fd);
errsv = errno;
GLIB_PRIVATE_CALL (g_win32_pop_invalid_parameter_handler) (&handler);
g_assert_cmpint (result, !=, 0);
g_assert_cmpint (errsv, ==, EBADF);