drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* fhandler_tty.cc (fhandler_tty_slave::dup): Free path_conv strings 

to avoid memory leak.  Add comment.
	(fhandler_pty_master::dup): Ditto.
	* path.h (path_conv::free_strings): New method.
This commit is contained in:
Corinna Vinschen 2010-11-29 20:51:38 +00:00
parent 371a9496e8
commit 910e31f015
3 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,10 @@
2010-11-29 Corinna Vinschen <corinna@vinschen.de>
* fhandler_tty.cc (fhandler_tty_slave::dup): Free path_conv strings
to avoid memory leak. Add comment.
(fhandler_pty_master::dup): Ditto.
* path.h (path_conv::free_strings): New method.
2010-11-23 Corinna Vinschen <corinna@vinschen.de> 2010-11-23 Corinna Vinschen <corinna@vinschen.de>
* autoload.cc (SendARP): Remove. * autoload.cc (SendARP): Remove.

14
winsup/cygwin/fhandler_tty.cc
View File

@ -979,6 +979,18 @@ int
fhandler_tty_slave::dup (fhandler_base *child) fhandler_tty_slave::dup (fhandler_base *child)
{ {
fhandler_tty_slave *arch = (fhandler_tty_slave *) archetype; fhandler_tty_slave *arch = (fhandler_tty_slave *) archetype;
/* In dtable::dup_worker, the path_conv member has already been assigned
from "this" to "child". Part of this assigment (path_conv::operator=)
is to allocate memory for the strings "path" and "normalized_path from
cygheap. The below `child = *arch' statement will overwrite child's
path_conv again, this time from "*arch". By doing that, it will allocate
new strings from cygheap, overwriting the old pointer values. Thus, the
old allocated strings are lost, and we're leaking memory for each tty dup,
unless we free the strings here.
FIXME: We can't redefine path_conv::operator= so that it frees the old
strings. Probably it would be most helpful to copy only the required
members from *arch, rather than copying everything. */
child->pc.free_strings ();
*(fhandler_tty_slave *) child = *arch; *(fhandler_tty_slave *) child = *arch;
child->set_flags (get_flags ()); child->set_flags (get_flags ());
child->usecount = 0; child->usecount = 0;
@ -992,6 +1004,8 @@ int
fhandler_pty_master::dup (fhandler_base *child) fhandler_pty_master::dup (fhandler_base *child)
{ {
fhandler_tty_master *arch = (fhandler_tty_master *) archetype; fhandler_tty_master *arch = (fhandler_tty_master *) archetype;
/* See comment in fhandler_tty_slave::dup. */
child->pc.free_strings ();
*(fhandler_tty_master *) child = *arch; *(fhandler_tty_master *) child = *arch;
child->set_flags (get_flags ()); child->set_flags (get_flags ());
child->usecount = 0; child->usecount = 0;

5
winsup/cygwin/path.h
View File

@ -293,6 +293,11 @@ class path_conv
wide_path = NULL; wide_path = NULL;
return *this; return *this;
} }
void free_strings ()
{
cfree (modifiable_path ());
cfree ((char *) normalized_path);
}
DWORD get_devn () const {return dev.devn;} DWORD get_devn () const {return dev.devn;}
short get_unitn () const {return dev.minor;} short get_unitn () const {return dev.minor;}
DWORD file_attributes () const {return fileattr;} DWORD file_attributes () const {return fileattr;}