diff options
| author | Paul Eggert | 2014-08-07 07:17:03 -0700 |
|---|---|---|
| committer | Paul Eggert | 2014-08-07 07:17:03 -0700 |
| commit | b110679002012873c9d44e865e65a5c7f8cc8b1b (patch) | |
| tree | e24339b74d0b3ad3e0e3a870dc3f1ac9799e2f2b /src | |
| parent | 6d9d9cde2f7672efc5d74dc1f8f4a8bd9deb27ea (diff) | |
| download | emacs-b110679002012873c9d44e865e65a5c7f8cc8b1b.tar.gz emacs-b110679002012873c9d44e865e65a5c7f8cc8b1b.zip | |
* xterm.c (x_delete_terminal): Plug file descriptor leak.
Fixes: debbugs:17691
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/xterm.c | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 9369ee25cca..2c5001e9a5a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2014-08-07 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | * xterm.c (x_delete_terminal): Plug file descriptor leak (Bug#17691). | ||
| 4 | |||
| 1 | 2014-08-07 Reuben Thomas <rrt@sc3d.org> | 5 | 2014-08-07 Reuben Thomas <rrt@sc3d.org> |
| 2 | 6 | ||
| 3 | Refer to MS-DOS using the same name everywhere. | 7 | Refer to MS-DOS using the same name everywhere. |
diff --git a/src/xterm.c b/src/xterm.c index 4ec38cfc5c6..7b8d32a4516 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -11329,7 +11329,10 @@ x_delete_terminal (struct terminal *terminal) | |||
| 11329 | 11329 | ||
| 11330 | /* No more input on this descriptor. */ | 11330 | /* No more input on this descriptor. */ |
| 11331 | if (0 <= dpyinfo->connection) | 11331 | if (0 <= dpyinfo->connection) |
| 11332 | delete_keyboard_wait_descriptor (dpyinfo->connection); | 11332 | { |
| 11333 | delete_keyboard_wait_descriptor (dpyinfo->connection); | ||
| 11334 | emacs_close (dpyinfo->connection); | ||
| 11335 | } | ||
| 11333 | 11336 | ||
| 11334 | /* Mark as dead. */ | 11337 | /* Mark as dead. */ |
| 11335 | dpyinfo->display = NULL; | 11338 | dpyinfo->display = NULL; |