From a066fb1ceee373c982214c28206108c5fba01bf7 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 21 Jul 2016 11:27:55 +0200
Subject: [PATCH] Fix use-after-close in connect_network_socket
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

* src/process.c (connect_network_socket): Don’t use
external_sock_fd after closing it.  Problem found by Coverity Scan.
---
 src/process.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/process.c b/src/process.c
index bdbdefabb64..bc2ac451c9d 100644
--- a/src/process.c
+++ b/src/process.c
@@ -3185,6 +3185,8 @@ connect_network_socket (Lisp_Object proc, Lisp_Object addrinfos,
 	      xerrno = errno;
 	      emacs_close (s);
 	      s = -1;
+	      if (socket_to_use < 0)
+		break;
 	      continue;
 	    }
 	}
@@ -3312,6 +3314,8 @@ connect_network_socket (Lisp_Object proc, Lisp_Object addrinfos,
       specpdl_ptr = specpdl + count1;
       emacs_close (s);
       s = -1;
+      if (socket_to_use < 0)
+	break;
 
 #ifdef WINDOWSNT
       if (xerrno == EINTR)
-- 
2.11.4.GIT