Fix mem error (swoole#4050)

matyhtf · web-flow · commit b41cdea7233b · 2021-02-09T00:49:53.000+08:00
* fix

* fix 2

* fix 3

* fix tests

* fix tests[2]
diff --git a/ext-src/php_swoole.cc b/ext-src/php_swoole.cc
@@ -398,6 +398,9 @@ SW_API bool php_swoole_is_enable_coroutine() {
 static void fatal_error(int code, const char *format, ...) {
     va_list args;
     zend_object *exception;
+    if (sw_reactor()) {
+        sw_reactor()->bailout = true;
+    }
     va_start(args, format);
     exception = zend_throw_exception(swoole_error_ce, swoole::std_string::vformat(format, args).c_str(), code);
     va_end(args);
diff --git a/ext-src/swoole_runtime.cc b/ext-src/swoole_runtime.cc
@@ -1069,6 +1069,7 @@ static php_stream *socket_create(const char *proto,
                 zval *ztmp;
                 if (php_swoole_array_get_value_ex(options, name, ztmp)) {
                     add_assoc_zval_ex(&zalias, alias, strlen(alias), ztmp);
+                    zval_add_ref(ztmp);
                 }
             };
 
@@ -1087,7 +1088,7 @@ static php_stream *socket_create(const char *proto,
             if (!sock->ssl_check_context()) {
                 goto _failed;
             }
-            zend_array_destroy(Z_ARRVAL(zalias));
+            zval_dtor(&zalias);
         }
 #endif
     }
diff --git a/tests/swoole_client_sync/sendto.phpt b/tests/swoole_client_sync/sendto.phpt
@@ -15,11 +15,11 @@ $pm = new SwooleTest\ProcessManager;
 $pm->parentFunc = function () use ($pm) {
     $cli = new Client(SWOOLE_SOCK_UDP);
 
-    $cli->sendto('127.0.0.1', $pm->getFreePort(), "hello");
-    $cli->sendto('localhost', $pm->getFreePort(), "hello");
+    $cli->sendto('127.0.0.1', $pm->getFreePort(), "packet-1");
+    $cli->sendto('localhost', $pm->getFreePort(), "packet-2");
     Assert::false($cli->sendto('error_domain', $pm->getFreePort(), "hello"));
     Assert::assert($cli->errCode, SWOOLE_ERROR_DNSLOOKUP_RESOLVE_FAILED);
-    $cli->sendto('localhost', $pm->getFreePort(), "hello");
+    $cli->sendto('localhost', $pm->getFreePort(), "packet-3");
     echo "DONE\n";
 };
 $pm->childFunc = function () use ($pm) {
@@ -29,11 +29,11 @@ $pm->childFunc = function () use ($pm) {
         $pm->wakeup();
         $peer = null;
         $ret = $socket->recvfrom($peer);
-        Assert::eq($ret, 'hello', 'packet-1');
+        Assert::eq($ret, 'packet-1');
         $ret = $socket->recvfrom($peer);
-        Assert::eq($ret, 'hello', 'packet-2');
+        Assert::eq($ret, 'packet-2');
         $ret = $socket->recvfrom($peer);
-        Assert::eq($ret, 'hello', 'packet-3');
+        Assert::eq($ret, 'packet-3');
     });
 };
 $pm->childFirst();
diff --git a/tests/swoole_coroutine/check.phpt b/tests/swoole_coroutine/check.phpt
@@ -5,6 +5,9 @@ swoole_coroutine: check if is in the coroutine
 --FILE--
 <?php
 require __DIR__ . '/../include/bootstrap.php';
+
+define('RUN_IN_CHILD', true);
+
 $map = [
     function () {
         Co::sleep(0.001);
@@ -54,9 +57,9 @@ $map = [
         Co::getaddrinfo('www.swoole.com');
         Assert::assert(0); // never here
     },
-    // function () {
-    // Co::statvfs(__DIR__); // can use outside the coroutine
-    // },
+//    function () {
+//        Co::statvfs(__DIR__);
+//    },
     function () {
         Co::exec('echo');
         Assert::assert(0); // never here
@@ -112,6 +115,10 @@ if (class_exists(Co\Http2\Client::class)) {
 $info_list = [];
 foreach ($map as $i => $f) {
     $GLOBALS['f'] = $f;
+    if (RUN_IN_CHILD == false) {
+        $f();
+        continue;
+    }
     $process = new Swoole\Process(function () {
         function a()
         {

Original file line number	Diff line number	Diff line change
`@@ -1069,6 +1069,7 @@ static php_stream socket_create(const char proto,`
`1069`	`1069`	`zval *ztmp;`
`1070`	`1070`	`if (php_swoole_array_get_value_ex(options, name, ztmp)) {`
`1071`	`1071`	`add_assoc_zval_ex(&zalias, alias, strlen(alias), ztmp);`
	`1072`	`+ zval_add_ref(ztmp);`
`1072`	`1073`	`}`
`1073`	`1074`	`};`
`1074`	`1075`
`@@ -1087,7 +1088,7 @@ static php_stream socket_create(const char proto,`
`1087`	`1088`	`if (!sock->ssl_check_context()) {`
`1088`	`1089`	`goto _failed;`
`1089`	`1090`	`}`
`1090`		`- zend_array_destroy(Z_ARRVAL(zalias));`
	`1091`	`+ zval_dtor(&zalias);`
`1091`	`1092`	`}`
`1092`	`1093`	`#endif`
`1093`	`1094`	`}`