Fix the crash caused by inconsistent return types

Author: matyhtf

ext-src/php_swoole_cxx.h

@@ -711,6 +711,11 @@ static inline void array_set(zval *arg, const char *key, size_t l_key, const cha
     add_assoc_zval_ex(arg, key, l_key, &ztmp);
 }
 
+static inline void array_set(zval *arg, zend_ulong index, zval *zvalue) {
+    Z_TRY_ADDREF_P(zvalue);
+    zend_hash_index_add(Z_ARRVAL_P(arg), index, zvalue);
+}
+
 static inline void array_add(zval *arg, zval *zvalue) {
     Z_TRY_ADDREF_P(zvalue);
     add_next_index_zval(arg, zvalue);

ext-src/swoole_http_server_coro.cc

@@ -544,7 +544,7 @@ static PHP_METHOD(swoole_http_server_coro, onAccept) {
 
     ZEND_PARSE_PARAMETERS_START_EX(ZEND_PARSE_PARAMS_THROW, 1, 1)
     Z_PARAM_OBJECT(zconn)
-    ZEND_PARSE_PARAMETERS_END_EX(RETURN_FALSE);
+    ZEND_PARSE_PARAMETERS_END_EX(RETURN_NULL());
 
     Coroutine *co = Coroutine::get_current();
     Socket *sock = php_swoole_get_socket(zconn);
@@ -557,11 +557,10 @@ static PHP_METHOD(swoole_http_server_coro, onAccept) {
 
 #ifdef SW_USE_OPENSSL
     if (sock->ssl_is_enable() && !sock->ssl_handshake()) {
-        RETURN_FALSE;
+        RETURN_NULL();
     }
 #endif
-    Z_TRY_ADDREF_P(zconn);
-    zend_hash_index_add(Z_ARRVAL_P(&hs->zclients), co->get_cid(), zconn);
+    zend::array_set(&hs->zclients, co->get_cid(), zconn);
     zend::Variable remote_addr = zend::Variable(sock->get_addr());
 
     while (true) {

tests/swoole_http_server_coro/crash-bad-return-type.phpt

@@ -0,0 +1,46 @@
+--TEST--
+swoole_http_server_coro: crash - bad return type
+--SKIPIF--
+<?php require __DIR__ . '/../include/skipif.inc'; ?>
+--FILE--
+<?php
+require __DIR__ . '/../include/bootstrap.php';
+
+$port = get_one_free_port();
+
+Co::set(['log_file' => '/dev/null']);
+
+go(function () use ($port) {
+    $server = new Co\Http\Server("127.0.0.1", $port, true);
+    $server->set([
+        'open_tcp_nodelay' => true,
+        'ssl_cert_file' => SSL_FILE_DIR.'/server.crt',
+        'ssl_key_file' => SSL_FILE_DIR.'/server.key',
+    ]);
+    $server->handle('/', function ($request, $response) {
+        $response->end("<h1>Index</h1>");
+    });
+    $server->handle('/stop', function ($request, $response) use ($server) {
+        $response->end("<h1>Stop</h1>");
+        $server->shutdown();
+    });
+    $server->start();
+});
+
+go(function () use ($port) {
+    try {
+        echo httpGetBody("http://127.0.0.1:{$port}/") . PHP_EOL;
+    } catch (Throwable $e) {
+        Assert::contains($e->getMessage(), 'Connection reset by peer');
+        echo "Bad Client\n";
+    }
+    echo httpGetBody("https://127.0.0.1:{$port}/") . PHP_EOL;
+    echo httpGetBody("https://127.0.0.1:{$port}/stop?hello=1") . PHP_EOL;
+});
+Swoole\Event::wait();
+
+?>
+--EXPECT--
+Bad Client
+<h1>Index</h1>
+<h1>Stop</h1>