luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-09-27 17:52:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

glocalfileoutputstream: Tidy up error handling

Browse Source 
After the recent reworking of this code it was possible for `g_close()`
to be called on `fd == -1`, which is invalid. It would have reported an
error, were errors not ignored. So it was harmless, but still best to
fix.

Simplify the error handling by combining both error labels and checking
the state of `fd` dynamically.

Coverity CID: #1450834

Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
(cherry picked from commit c4b4fecaef)
This commit is contained in:
Philip Withnall
2021-03-16 11:36:27 +00:00
committed by Simon McVittie
parent 7bfe2dcebe
commit af39d83fc7
1 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
gio/glocalfileoutputstream.c
View File

@@ -829,7 +829,7 @@ handle_overwrite_open (const char *filename,
_("Error when getting information for file “%s”: %s"),
display_name, g_strerror (errsv));
g_free (display_name);
goto err_out;
goto error;
}
/* not a regular file */
@@ -841,7 +841,7 @@ handle_overwrite_open (const char *filename,
G_IO_ERROR,
G_IO_ERROR_IS_DIRECTORY,
_("Target file is a directory"));
goto err_out;
goto error;
}
else if (!is_symlink ||
#ifdef S_ISLNK
@@ -855,7 +855,7 @@ handle_overwrite_open (const char *filename,
G_IO_ERROR,
G_IO_ERROR_NOT_REGULAR_FILE,
_("Target file is not a regular file"));
goto err_out;
goto error;
}
}
@@ -869,7 +869,7 @@ handle_overwrite_open (const char *filename,
G_IO_ERROR_WRONG_ETAG,
_("The file was externally modified"));
g_free (current_etag);
goto err_out;
goto error;
}
g_free (current_etag);
}
@@ -962,7 +962,7 @@ handle_overwrite_open (const char *filename,
G_IO_ERROR_CANT_CREATE_BACKUP,
_("Backup file creation failed"));
g_free (backup_filename);
goto err_out;
goto error;
}
bfd = g_open (backup_filename,
@@ -976,7 +976,7 @@ handle_overwrite_open (const char *filename,
G_IO_ERROR_CANT_CREATE_BACKUP,
_("Backup file creation failed"));
g_free (backup_filename);
goto err_out;
goto error;
}
/* If needed, Try to set the group of the backup same as the
@@ -993,7 +993,7 @@ handle_overwrite_open (const char *filename,
g_unlink (backup_filename);
g_close (bfd, NULL);
g_free (backup_filename);
goto err_out;
goto error;
}
if ((original_stat.st_gid != tmp_statbuf.st_gid) &&
@@ -1010,7 +1010,7 @@ handle_overwrite_open (const char *filename,
g_unlink (backup_filename);
g_close (bfd, NULL);
g_free (backup_filename);
goto err_out;
goto error;
}
}
#endif
@@ -1025,7 +1025,7 @@ handle_overwrite_open (const char *filename,
g_close (bfd, NULL);
g_free (backup_filename);
goto err_out;
goto error;
}
g_close (bfd, NULL);
@@ -1040,7 +1040,7 @@ handle_overwrite_open (const char *filename,
g_io_error_from_errno (errsv),
_("Error seeking in file: %s"),
g_strerror (errsv));
goto err_out;
goto error;
}
}
@@ -1056,7 +1056,7 @@ handle_overwrite_open (const char *filename,
g_io_error_from_errno (errsv),
_("Error removing old file: %s"),
g_strerror (errsv));
goto err_out2;
goto error;
}
if (readable)
@@ -1073,7 +1073,7 @@ handle_overwrite_open (const char *filename,
_("Error opening file “%s”: %s"),
display_name, g_strerror (errsv));
g_free (display_name);
goto err_out2;
goto error;
}
}
else
@@ -1091,15 +1091,16 @@ handle_overwrite_open (const char *filename,
g_io_error_from_errno (errsv),
_("Error truncating file: %s"),
g_strerror (errsv));
goto err_out;
goto error;
}
}
return fd;
err_out:
g_close (fd, NULL);
err_out2:
error:
if (fd >= 0)
g_close (fd, NULL);
return -1;
}