JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* fhandler_proc.cc (format_proc_swaps): Use tmp_pathbuf for filename,

Browse Source 
rather than allocating and forgetting to free (CID 59982).
This commit is contained in:
Corinna Vinschen 2014-05-20 11:00:37 +00:00
parent 3da259f729
commit 3ccae7b681
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,8 @@
2014-05-20 Corinna Vinschen <corinna@vinschen.de>
* fhandler_proc.cc (format_proc_swaps): Use tmp_pathbuf for filename,
rather than allocating and forgetting to free (CID 59982).
2014-05-20 Corinna Vinschen <corinna@vinschen.de> 2014-05-20 Corinna Vinschen <corinna@vinschen.de>
* fhandler_floppy.cc (fhandler_dev_floppy::get_drive_info): Fix floppy * fhandler_floppy.cc (fhandler_dev_floppy::get_drive_info): Fix floppy

12
winsup/cygwin/fhandler_proc.cc
View File

@ -1,7 +1,7 @@
/* fhandler_proc.cc: fhandler for /proc virtual filesystem /* fhandler_proc.cc: fhandler for /proc virtual filesystem
Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012,
2013 Red Hat, Inc. 2013, 2014 Red Hat, Inc.
This file is part of Cygwin. This file is part of Cygwin.
@ -1270,8 +1270,6 @@ static off_t
format_proc_swaps (void *, char *&destbuf) format_proc_swaps (void *, char *&destbuf)
{ {
unsigned long long total = 0ULL, used = 0ULL; unsigned long long total = 0ULL, used = 0ULL;
char *filename = NULL;
ssize_t filename_len;
PSYSTEM_PAGEFILE_INFORMATION spi = NULL; PSYSTEM_PAGEFILE_INFORMATION spi = NULL;
ULONG size = 512; ULONG size = 512;
NTSTATUS status = STATUS_SUCCESS; NTSTATUS status = STATUS_SUCCESS;
@ -1301,17 +1299,13 @@ format_proc_swaps (void *, char *&destbuf)
if (spi && NT_SUCCESS (status)) if (spi && NT_SUCCESS (status))
{ {
PSYSTEM_PAGEFILE_INFORMATION spp = spi; PSYSTEM_PAGEFILE_INFORMATION spp = spi;
char *filename = tp.c_get ();
do do
{ {
total = (unsigned long long) spp->CurrentSize * wincap.page_size (); total = (unsigned long long) spp->CurrentSize * wincap.page_size ();
used = (unsigned long long) spp->TotalUsed * wincap.page_size (); used = (unsigned long long) spp->TotalUsed * wincap.page_size ();
filename_len = cygwin_conv_path (CCP_WIN_W_TO_POSIX,
spp->FileName.Buffer, filename, 0);
filename = (char *) malloc (filename_len);
cygwin_conv_path (CCP_WIN_W_TO_POSIX, spp->FileName.Buffer, cygwin_conv_path (CCP_WIN_W_TO_POSIX, spp->FileName.Buffer,
filename, filename_len); filename, NT_MAX_PATH);
bufptr += sprintf (bufptr, "%-40s%-16s%-8llu%-8llu%-8d\n", bufptr += sprintf (bufptr, "%-40s%-16s%-8llu%-8llu%-8d\n",
filename, "file", total >> 10, used >> 10, 0); filename, "file", total >> 10, used >> 10, 0);
} }