* process.c (recv_child_error): Fix deadlock in rb_fork_internal when a

charliesome · Charlie Somerville · commit 8f9c7e2c4124 · 2014-01-23T16:09:29.000+11:00
signal is sent to the parent process while Ruby is forking in IO.popen. Patch by Scott Francis. Closes rubyGH-513. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44687 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/process.c b/process.c
@@ -3339,8 +3339,11 @@ recv_child_error(int fd, int *statep, VALUE *excp, int *errp, char *errmsg, size
     }
 #define READ_FROM_CHILD(ptr, len) \
     (NIL_P(io) ? read(fd, (ptr), (len)) : rb_io_bufread(io, (ptr), (len)))
-    if ((size = READ_FROM_CHILD(&err, sizeof(err))) < 0) {
+    while ((size = READ_FROM_CHILD(&err, sizeof(err))) < 0) {
         err = errno;
+        if (err != EINTR) {
+            break;
+        }
     }
     *errp = err;
     if (size == sizeof(err) &&

Original file line number	Diff line number	Diff line change
`@@ -3339,8 +3339,11 @@ recv_child_error(int fd, int statep, VALUE excp, int errp, char errmsg, size`
`3339`	`3339`	`}`
`3340`	`3340`	`#define READ_FROM_CHILD(ptr, len) \`
`3341`	`3341`	`(NIL_P(io) ? read(fd, (ptr), (len)) : rb_io_bufread(io, (ptr), (len)))`
`3342`		`- if ((size = READ_FROM_CHILD(&err, sizeof(err))) < 0) {`
	`3342`	`+ while ((size = READ_FROM_CHILD(&err, sizeof(err))) < 0) {`
`3343`	`3343`	`err = errno;`
	`3344`	`+ if (err != EINTR) {`
	`3345`	`+ break;`
	`3346`	`+ }`
`3344`	`3347`	`}`
`3345`	`3348`	`*errp = err;`
`3346`	`3349`	`if (size == sizeof(err) &&`