Fix swoole#2444.

twose · twose · commit 33535b64c134 · 2019-03-22T14:45:12.000+08:00
diff --git a/include/swoole.h b/include/swoole.h
@@ -1820,11 +1820,7 @@ void swReactor_defer_task_destroy(swReactor *reactor);
 
 static sw_inline swConnection* swReactor_get(swReactor *reactor, int fd)
 {
-    if (reactor->thread)
-    {
-        return &reactor->socket_list[fd];
-    }
-    swConnection *socket = (swConnection*) swArray_alloc(reactor->socket_array, fd);
+    swConnection *socket = reactor->thread ? &reactor->socket_list[fd] : (swConnection*) swArray_alloc(reactor->socket_array, fd);
     if (socket && !socket->active)
     {
         socket->fd = fd;
diff --git a/src/reactor/base.c b/src/reactor/base.c
@@ -231,7 +231,7 @@ int swReactor_write(swReactor *reactor, int fd, void *buf, int n)
     swConnection *socket = swReactor_get(reactor, fd);
     swBuffer *buffer = socket->out_buffer;
 
-    if (socket->fd == 0)
+    if (socket->fd <= 0)
     {
         socket->fd = fd;
     }

Original file line number	Diff line number	Diff line change
`@@ -1820,11 +1820,7 @@ void swReactor_defer_task_destroy(swReactor *reactor);`
`1820`	`1820`
`1821`	`1821`	`static sw_inline swConnection* swReactor_get(swReactor *reactor, int fd)`
`1822`	`1822`	`{`
`1823`		`- if (reactor->thread)`
`1824`		`- {`
`1825`		`- return &reactor->socket_list[fd];`
`1826`		`- }`
`1827`		`- swConnection socket = (swConnection) swArray_alloc(reactor->socket_array, fd);`
	`1823`	`+ swConnection socket = reactor->thread ? &reactor->socket_list[fd] : (swConnection) swArray_alloc(reactor->socket_array, fd);`
`1828`	`1824`	`if (socket && !socket->active)`
`1829`	`1825`	`{`
`1830`	`1826`	`socket->fd = fd;`
Original file line number	Diff line number	Diff line change
`@@ -231,7 +231,7 @@ int swReactor_write(swReactor reactor, int fd, void buf, int n)`
`231`	`231`	`swConnection *socket = swReactor_get(reactor, fd);`
`232`	`232`	`swBuffer *buffer = socket->out_buffer;`
`233`	`233`
`234`		`- if (socket->fd == 0)`
	`234`	`+ if (socket->fd <= 0)`
`235`	`235`	`{`
`236`	`236`	`socket->fd = fd;`
`237`	`237`	`}`