diff options
| author | Paul Eggert | 2016-08-02 03:31:04 -0400 |
|---|---|---|
| committer | Paul Eggert | 2016-08-02 03:31:26 -0400 |
| commit | 53917616b0aca43b9ca85531d4dcb426885bdb73 (patch) | |
| tree | cda328ac4c838ee71b05da754652398e6f5bfc51 /src | |
| parent | 573dde70a4bcd7ad972e25260374f5019c671df1 (diff) | |
| download | emacs-53917616b0aca43b9ca85531d4dcb426885bdb73.tar.gz emacs-53917616b0aca43b9ca85531d4dcb426885bdb73.zip | |
Fix use-after-close in connect_network_socket
* src/process.c (connect_network_socket):
Reverse sense of previous fix. Problem reported by Ken Brown in:
http://lists.gnu.org/archive/html/emacs-devel/2016-08/msg00004.html
Diffstat (limited to 'src')
| -rw-r--r-- | src/process.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/process.c b/src/process.c index bc2ac451c9d..5e48e4348fe 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -3185,7 +3185,7 @@ connect_network_socket (Lisp_Object proc, Lisp_Object addrinfos, | |||
| 3185 | xerrno = errno; | 3185 | xerrno = errno; |
| 3186 | emacs_close (s); | 3186 | emacs_close (s); |
| 3187 | s = -1; | 3187 | s = -1; |
| 3188 | if (socket_to_use < 0) | 3188 | if (0 <= socket_to_use) |
| 3189 | break; | 3189 | break; |
| 3190 | continue; | 3190 | continue; |
| 3191 | } | 3191 | } |
| @@ -3314,7 +3314,7 @@ connect_network_socket (Lisp_Object proc, Lisp_Object addrinfos, | |||
| 3314 | specpdl_ptr = specpdl + count1; | 3314 | specpdl_ptr = specpdl + count1; |
| 3315 | emacs_close (s); | 3315 | emacs_close (s); |
| 3316 | s = -1; | 3316 | s = -1; |
| 3317 | if (socket_to_use < 0) | 3317 | if (0 <= socket_to_use) |
| 3318 | break; | 3318 | break; |
| 3319 | 3319 | ||
| 3320 | #ifdef WINDOWSNT | 3320 | #ifdef WINDOWSNT |