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

gfileutils: add some sanity checks

Browse Source 
To avoid handling non-null GError or NULL filename.

https://bugzilla.gnome.org/show_bug.cgi?id=754026
This commit is contained in:
Aurélien Zanelli 2015-08-24 16:07:32 +02:00 committed by Philip Withnall
parent eb5120d0df
commit 21d2c64660
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
glib/gfileutils.c
View File

@ -1609,6 +1609,8 @@ g_file_open_tmp (const gchar *tmpl,
gchar *fulltemplate; gchar *fulltemplate;
gint result; gint result;
g_return_val_if_fail (error == NULL || *error == NULL, -1);
result = g_get_tmp_name (tmpl, &fulltemplate, result = g_get_tmp_name (tmpl, &fulltemplate,
wrap_g_open, wrap_g_open,
O_CREAT | O_EXCL | O_RDWR | O_BINARY, O_CREAT | O_EXCL | O_RDWR | O_BINARY,
@ -1656,6 +1658,8 @@ g_dir_make_tmp (const gchar *tmpl,
{ {
gchar *fulltemplate; gchar *fulltemplate;
g_return_val_if_fail (error == NULL || *error == NULL, NULL);
if (g_get_tmp_name (tmpl, &fulltemplate, wrap_g_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
@ -2053,6 +2057,9 @@ g_file_read_link (const gchar *filename,
size_t size; size_t size;
ssize_t read_size; ssize_t read_size;
g_return_val_if_fail (filename != NULL, NULL);
g_return_val_if_fail (error == NULL || *error == NULL, NULL);
size = 256; size = 256;
buffer = g_malloc (size); buffer = g_malloc (size);
@ -2080,6 +2087,9 @@ g_file_read_link (const gchar *filename,
buffer = g_realloc (buffer, size); buffer = g_realloc (buffer, size);
} }
#else #else
g_return_val_if_fail (filename != NULL, NULL);
g_return_val_if_fail (error == NULL || *error == NULL, NULL);
g_set_error_literal (error, g_set_error_literal (error,
G_FILE_ERROR, G_FILE_ERROR,
G_FILE_ERROR_INVAL, G_FILE_ERROR_INVAL,