do not try to read from closed socket

kelvich · kelvich · commit d49f9fb75e2d · 2018-08-17T15:56:02.000+03:00
diff --git a/arbiter.c b/arbiter.c
@@ -262,7 +262,7 @@ static int MtmReadSocket(int sd, void* buf, int buf_size)
 {
 	int rc;
 	while ((rc = pg_recv(sd, buf, buf_size, 0, MtmUseRDMA)) < 0 && errno == EINTR);			
-	if (rc <= 0 && (errno == EAGAIN || errno == EINPROGRESS)) { 
+	if (rc < 0 && (errno == EAGAIN || errno == EINPROGRESS)) {
 		rc = MtmWaitSocket(sd, false, MtmHeartbeatSendTimeout);
 		if (rc == 1) { 
 			while ((rc = pg_recv(sd, buf, buf_size, 0, MtmUseRDMA)) < 0 && errno == EINTR);			

Original file line number	Diff line number	Diff line change
`@@ -262,7 +262,7 @@ static int MtmReadSocket(int sd, void* buf, int buf_size)`
`262`	`262`	`{`
`263`	`263`	`int rc;`
`264`	`264`	`while ((rc = pg_recv(sd, buf, buf_size, 0, MtmUseRDMA)) < 0 && errno == EINTR);`
`265`		`- if (rc <= 0 && (errno == EAGAIN \|\| errno == EINPROGRESS)) {`
	`265`	`+ if (rc < 0 && (errno == EAGAIN \|\| errno == EINPROGRESS)) {`
`266`	`266`	`rc = MtmWaitSocket(sd, false, MtmHeartbeatSendTimeout);`
`267`	`267`	`if (rc == 1) {`
`268`	`268`	`while ((rc = pg_recv(sd, buf, buf_size, 0, MtmUseRDMA)) < 0 && errno == EINTR);`