projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix a pty-freeing error which caused a segfault if you attempted to
[u/mdw/putty]
/
unix
/
uxpty.c
diff --git
a/unix/uxpty.c
b/unix/uxpty.c
index
99ff638
..
5ebd050
100644
(file)
--- a/
unix/uxpty.c
+++ b/
unix/uxpty.c
@@
-411,6
+411,7
@@
void pty_pre_init(void)
#endif
pty = single_pty = snew(struct pty_tag);
#endif
pty = single_pty = snew(struct pty_tag);
+ pty->conf = NULL;
bufchain_init(&pty->output_data);
/* set the child signal handler straight away; it needs to be set
bufchain_init(&pty->output_data);
/* set the child signal handler straight away; it needs to be set
@@
-725,6
+726,7
@@
static const char *pty_init(void *frontend, void **backend_handle, Conf *conf,
if (single_pty) {
pty = single_pty;
if (single_pty) {
pty = single_pty;
+ assert(pty->conf == NULL);
} else {
pty = snew(struct pty_tag);
pty->master_fd = pty->slave_fd = -1;
} else {
pty = snew(struct pty_tag);
pty->master_fd = pty->slave_fd = -1;
@@
-967,7
+969,17
@@
static void pty_free(void *handle)
del234(ptys_by_pid, pty);
del234(ptys_by_fd, pty);
del234(ptys_by_pid, pty);
del234(ptys_by_fd, pty);
- sfree(pty);
+ conf_free(pty->conf);
+ pty->conf = NULL;
+
+ if (pty == single_pty) {
+ /*
+ * Leave this structure around in case we need to Restart
+ * Session.
+ */
+ } else {
+ sfree(pty);
+ }
}
static void pty_try_write(Pty pty)
}
static void pty_try_write(Pty pty)