mirror of
https://git.savannah.gnu.org/git/coreutils.git
synced 2026-11-19 03:33:43 +03:00
(read_utmp): Likewise.
Check for fstat error. Close stream and free storage when failing.
This commit is contained in:
1 parent
651fd58f8f
commit
39468cd38f
1 file changed
+21
-11
+21
-11
@@ -104,23 +104,33 @@ read_utmp (const char *filename, int *n_entries, STRUCT_UTMP **utmp_buf)
|
||||
if (utmp == NULL)
|
||||
return 1;
|
||||
|
||||
fstat (fileno (utmp), &file_stats);
|
||||
size = file_stats.st_size;
|
||||
if (size > 0)
|
||||
buf = xmalloc (size);
|
||||
else
|
||||
if (fstat (fileno (utmp), &file_stats) != 0)
|
||||
{
|
||||
int e = errno;
|
||||
fclose (utmp);
|
||||
errno = e;
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* Use < instead of != in case the utmp just grew. */
|
||||
n_read = fread (buf, 1, size, utmp);
|
||||
if (ferror (utmp) || fclose (utmp) == EOF
|
||||
|| n_read < size)
|
||||
size = file_stats.st_size;
|
||||
buf = xmalloc (size);
|
||||
n_read = fread (buf, sizeof *buf, size / sizeof *buf, utmp);
|
||||
if (ferror (utmp))
|
||||
{
|
||||
int e = errno;
|
||||
free (buf);
|
||||
fclose (utmp);
|
||||
errno = e;
|
||||
return 1;
|
||||
}
|
||||
if (fclose (utmp) != 0)
|
||||
{
|
||||
int e = errno;
|
||||
free (buf);
|
||||
errno = e;
|
||||
return 1;
|
||||
}
|
||||
|
||||
*n_entries = size / sizeof (STRUCT_UTMP);
|
||||
*n_entries = n_read;
|
||||
*utmp_buf = buf;
|
||||
|
||||
return 0;
|
||||
|
||||
Reference in new issue
Block a user