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

Don't call varargs open() through non-varargs type

Browse Source 
open() is probably defined varargs.  Casting a varargs function to an
equivalent non-varargs type and then calling it is undefined, but
gfileutils.c was doing exactly that.

Add some non-varargs wrappers to avoid the problem.

Problem reported by John Spencer.

https://bugzilla.gnome.org/show_bug.cgi?id=687600
This commit is contained in:
Ryan Lortie 2012-11-05 12:22:49 -05:00 committed by Matthias Clasen
parent 9aa447b13a
commit 545cda4fef
1 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
glib/gfileutils.c
View File

@ -1310,7 +1310,7 @@ g_file_set_contents (const gchar *filename,
* get_tmp_file based on the mkstemp implementation from the GNU C library. * get_tmp_file based on the mkstemp implementation from the GNU C library.
* Copyright (C) 1991,92,93,94,95,96,97,98,99 Free Software Foundation, Inc. * Copyright (C) 1991,92,93,94,95,96,97,98,99 Free Software Foundation, Inc.
*/ */
typedef gint (*GTmpFileCallback) (gchar *, gint, gint); typedef gint (*GTmpFileCallback) (const gchar *, gint, gint);
static gint static gint
get_tmp_file (gchar *tmpl, get_tmp_file (gchar *tmpl,
@ -1375,13 +1375,27 @@ get_tmp_file (gchar *tmpl,
return -1; return -1;
} }
/* Some GTmpFileCallback implementations.
*
* Note: we cannot use open() or g_open() directly because even though
* they appear compatible, they may be vararg functions and calling
* varargs functions through a non-varargs type is undefined.
*/
static gint static gint
wrap_mkdir (gchar *tmpl, wrap_g_mkdir (const gchar *filename,
int flags G_GNUC_UNUSED, int flags G_GNUC_UNUSED,
int mode) int mode)
{ {
/* tmpl is in UTF-8 on Windows, thus use g_mkdir() */ /* tmpl is in UTF-8 on Windows, thus use g_mkdir() */
return g_mkdir (tmpl, mode); return g_mkdir (filename, mode);
}
static gint
wrap_g_open (const gchar *filename,
int flags,
int mode)
{
return g_open (filename, flags, mode);
} }
/** /**
@ -1411,7 +1425,7 @@ gchar *
g_mkdtemp_full (gchar *tmpl, g_mkdtemp_full (gchar *tmpl,
gint mode) gint mode)
{ {
if (get_tmp_file (tmpl, wrap_mkdir, 0, mode) == -1) if (get_tmp_file (tmpl, wrap_g_mkdir, 0, mode) == -1)
return NULL; return NULL;
else else
return tmpl; return tmpl;
@ -1477,7 +1491,7 @@ g_mkstemp_full (gchar *tmpl,
gint mode) gint mode)
{ {
/* tmpl is in UTF-8 on Windows, thus use g_open() */ /* tmpl is in UTF-8 on Windows, thus use g_open() */
return get_tmp_file (tmpl, (GTmpFileCallback) g_open, return get_tmp_file (tmpl, wrap_g_open,
flags | O_CREAT | O_EXCL, mode); flags | O_CREAT | O_EXCL, mode);
} }
@ -1627,7 +1641,7 @@ g_file_open_tmp (const gchar *tmpl,
gint result; gint result;
result = g_get_tmp_name (tmpl, &fulltemplate, result = g_get_tmp_name (tmpl, &fulltemplate,
(GTmpFileCallback) g_open, wrap_g_open,
O_CREAT | O_EXCL | O_RDWR | O_BINARY, O_CREAT | O_EXCL | O_RDWR | O_BINARY,
0600, 0600,
error); error);
@ -1673,7 +1687,7 @@ g_dir_make_tmp (const gchar *tmpl,
{ {
gchar *fulltemplate; gchar *fulltemplate;
if (g_get_tmp_name (tmpl, &fulltemplate, wrap_mkdir, 0, 0700, error) == -1) if (g_get_tmp_name (tmpl, &fulltemplate, wrap_g_mkdir, 0, 0700, error) == -1)
return NULL; return NULL;
else else
return fulltemplate; return fulltemplate;
@ -2597,13 +2611,21 @@ g_file_get_contents (const gchar *filename,
#undef g_mkstemp #undef g_mkstemp
static gint
wrap_libc_open (const gchar *filename,
int flags,
int mode)
{
return open (filename, flags, mode);
}
gint gint
g_mkstemp (gchar *tmpl) g_mkstemp (gchar *tmpl)
{ {
/* This is the backward compatibility system codepage version, /* This is the backward compatibility system codepage version,
* thus use normal open(). * thus use normal open().
*/ */
return get_tmp_file (tmpl, (GTmpFileCallback) open, return get_tmp_file (tmpl, wrap_libc_open,
O_RDWR | O_CREAT | O_EXCL, 0600); O_RDWR | O_CREAT | O_EXCL, 0600);
} }