luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-23 12:41:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

tests/: Avoid closing invalid fd's

Browse Source 
...and only include unistd.h when we are on *NIX.

Newer Visual C++ runtimes (8.0/2005 and later) will cause the program to
crash with an internal abort() call when they detect instances of close()
being called on an invalid fd, such as when the fd is -1, and these should
be purged anyways.

https://bugzilla.gnome.org/show_bug.cgi?id=711047
This commit is contained in:
Chun-wei Fan 2013-11-05 12:58:40 +08:00
parent 172aaa3a01
commit ccba409d34
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/file-test.c
View File

@ -24,8 +24,6 @@
* GLib at ftp://ftp.gtk.org/pub/gtk/.
*/
#include "config.h"
#undef G_DISABLE_ASSERT
#undef G_LOG_DOMAIN
@ -39,7 +37,7 @@
#include <gstdio.h>
#ifdef HAVE_UNISTD_H
#ifdef G_OS_UNIX
#include <unistd.h>
#endif
@ -62,14 +60,18 @@ test_mkstemp (void)
strcpy (template, "foobar");
fd = g_mkstemp (template);
if (fd != -1)
g_warning ("g_mkstemp works even if template doesn't contain XXXXXX");
close (fd);
{
g_warning ("g_mkstemp works even if template doesn't contain XXXXXX");
close (fd);
}
strcpy (template, "foobarXXX");
fd = g_mkstemp (template);
if (fd != -1)
g_warning ("g_mkstemp works even if template contains less than six X");
close (fd);
{
g_warning ("g_mkstemp works even if template contains less than six X");
close (fd);
}
strcpy (template, "fooXXXXXX");
fd = g_mkstemp (template);

17
tests/testglib.c
View File

@ -24,8 +24,6 @@
* GLib at ftp://ftp.gtk.org/pub/gtk/.
*/
#include "config.h"
#undef GLIB_COMPILATION
#include <stdio.h>
@ -37,7 +35,7 @@
#include <stdlib.h>
#ifdef HAVE_UNISTD_H
#ifdef G_OS_UNIX
#include <unistd.h>
#endif
@ -938,8 +936,8 @@ test_file_functions (void)
chars[n] = 0;
if (strcmp (chars, hello) != 0)
g_error ("wrote '%s', but got '%s'\n", hello, chars);
close (fd);
if (fd != -1)
close (fd);
remove (template);
error = NULL;
@ -969,7 +967,8 @@ test_file_functions (void)
else
g_print ("g_file_open_tmp correctly returns error: %s\n", error->message);
}
close (fd);
if (fd != -1)
close (fd);
g_clear_error (&error);
g_free (name_used);
#endif
@ -981,7 +980,8 @@ test_file_functions (void)
g_error ("g_file_open_tmp didn't work for template '%s': %s\n", template, error->message);
else if (g_test_verbose())
g_print ("g_file_open_tmp for template '%s' used name '%s'\n", template, name_used);
close (fd);
if (fd != -1)
close (fd);
g_clear_error (&error);
remove (name_used);
g_free (name_used);
@ -990,7 +990,8 @@ test_file_functions (void)
fd = g_file_open_tmp (NULL, &name_used, &error);
if (fd == -1)
g_error ("g_file_open_tmp didn't work for a NULL template: %s\n", error->message);
close (fd);
else
close (fd);
g_clear_error (&error);
remove (name_used);
g_free (name_used);