Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Fix bug #72413: Segfault with get_result and PS cursors

diff --cc ext/mysqli/tests/mysqli_stmt_get_result.phpt
index 2dee92d9ae9d35040e5366763dd606aba9c75ae6,3613865e20dcad354d004c3fe610b32a638f05b5..74b15dfae3b05b090a625352ecdaecb5d48d6385
--- 1/ext/mysqli/tests/mysqli_stmt_get_result.phpt
--- 2/ext/mysqli/tests/mysqli_stmt_get_result.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_get_result.phpt
@@@ -10,113 -11,158 +10,144 @@@ if (!function_exists('mysqli_stmt_get_r
  ?>
  --FILE--
  <?php
 -      /*
 -      NOTE: no datatype tests here! This is done by
 -      mysqli_stmt_bind_result.phpt already. Restrict
 -      this test case to the basics.
 -      */
 -      require_once("connect.inc");
 +    /*
 +    NOTE: no datatype tests here! This is done by
 +    mysqli_stmt_bind_result.phpt already. Restrict
 +    this test case to the basics.
 +    */
 +    require_once("connect.inc");
  
 -      $tmp    = NULL;
 -      $link   = NULL;
 +    require('table.inc');
  
 -      if (!is_null($tmp = @mysqli_stmt_get_result()))
 -              printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
 -
 -      if (!is_null($tmp = @mysqli_stmt_get_result($link)))
 -              printf("[002] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
 -
 -      require('table.inc');
 -
 -      if (!$stmt = mysqli_stmt_init($link))
 -              printf("[003] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 -
 -      // stmt object status test
 -      if (false !== ($tmp = mysqli_stmt_fetch($stmt)))
 -              printf("[004] Expecting false, got %s/%s\n", gettype($tmp), var_export($tmp, 1));
 -
 -      if (!mysqli_stmt_prepare($stmt, "SELECT id, label FROM test ORDER BY id LIMIT 2"))
 -              printf("[005] [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
 -
 -      // FIXME - different versions return different values ?!
 -      if ((NULL !== ($tmp = mysqli_stmt_get_result($stmt))) && (false !== $tmp))
 -              printf("[006] Expecting NULL or boolean/false, got %s/%s\n", gettype($tmp), var_export($tmp, 1));
 -
 -      if (!mysqli_stmt_execute($stmt))
 -              printf("[007] [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
 +    if (!$stmt = mysqli_stmt_init($link))
 +        printf("[003] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
  
 -      if (!mysqli_stmt_store_result($stmt))
 -              printf("[008] [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
 +    // stmt object status test
 +    try {
 +        mysqli_stmt_fetch($stmt);
 +    } catch (Error $exception) {
 +        echo $exception->getMessage() . "\n";
 +    }
  
 -      if (is_object($tmp = mysqli_stmt_store_result($stmt)))
 -              printf("[009] non-object, got %s/%s\n", gettype($tmp), var_export($tmp, 1));
 +    if (!mysqli_stmt_prepare($stmt, "SELECT id, label FROM test ORDER BY id LIMIT 2"))
 +        printf("[005] [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
  
 -      mysqli_stmt_close($stmt);
 +    // FIXME - different versions return different values ?!
 +    if ((NULL !== ($tmp = mysqli_stmt_get_result($stmt))) && (false !== $tmp))
 +        printf("[006] Expecting NULL or boolean/false, got %s/%s\n", gettype($tmp), var_export($tmp, 1));
  
 -      if (!$stmt = mysqli_stmt_init($link))
 -              printf("[010] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 +    if (!mysqli_stmt_execute($stmt))
 +        printf("[007] [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
  
 -      // stmt object status test
 -      if (false !== ($tmp = mysqli_stmt_fetch($stmt)))
 -              printf("[011] Expecting false, got %s/%s\n", gettype($tmp), var_export($tmp, 1));
 +    if (!mysqli_stmt_store_result($stmt))
 +        printf("[008] [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
  
 -      if (!mysqli_stmt_prepare($stmt, "SELECT id, label FROM test ORDER BY id LIMIT 2"))
 -              printf("[012] [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
 +    if (is_object($tmp = mysqli_stmt_store_result($stmt)))
 +        printf("[009] non-object, got %s/%s\n", gettype($tmp), var_export($tmp, 1));
  
 -      // FIXME - different versions return different values ?!
 -      if ((NULL !== ($tmp = mysqli_stmt_get_result($stmt))) && (false !== $tmp))
 -              printf("[013] Expecting NULL or boolean/false, got %s/%s\n", gettype($tmp), var_export($tmp, 1));
 +    mysqli_stmt_close($stmt);
  
 -      if (!mysqli_stmt_execute($stmt))
 -              printf("[014] [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
 +    if (!$stmt = mysqli_stmt_init($link))
 +        printf("[010] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
  
 -      if (!is_object($tmp = mysqli_stmt_get_result($stmt)))
 -              printf("[016] NULL, got %s/%s\n", gettype($tmp), var_export($tmp, 1));
 +    // stmt object status test
 +    try {
 +        mysqli_stmt_fetch($stmt);
 +    } catch (Error $exception) {
 +        echo $exception->getMessage() . "\n";
 +    }
  
 -      mysqli_free_result($tmp);
 -      mysqli_stmt_close($stmt);
 +    if (!mysqli_stmt_prepare($stmt, "SELECT id, label FROM test ORDER BY id LIMIT 2"))
 +        printf("[012] [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
  
 -      if (!$stmt = mysqli_stmt_init($link))
 -              printf("[017] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 +    // FIXME - different versions return different values ?!
 +    if ((NULL !== ($tmp = mysqli_stmt_get_result($stmt))) && (false !== $tmp))
 +        printf("[013] Expecting NULL or boolean/false, got %s/%s\n", gettype($tmp), var_export($tmp, 1));
  
 -      // stmt object status test
 -      if (false !== ($tmp = mysqli_stmt_get_result($stmt)))
 -              printf("[018] Expecting false, got %s/%s\n", gettype($tmp), var_export($tmp, 1));
 +    if (!mysqli_stmt_execute($stmt))
 +        printf("[014] [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
  
 -      if (!mysqli_stmt_prepare($stmt, "SELECT id, label FROM test ORDER BY id LIMIT 2"))
 -              printf("[019] [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
 +    if (!is_object($tmp = mysqli_stmt_get_result($stmt)))
 +        printf("[016] NULL, got %s/%s\n", gettype($tmp), var_export($tmp, 1));
  
 -      if (false !== ($tmp = mysqli_stmt_get_result($stmt)))
 -              printf("[020] Expecting false, got %s/%s\n", gettype($tmp), var_export($tmp, 1));
 +    mysqli_free_result($tmp);
 +    mysqli_stmt_close($stmt);
  
 -      if (!mysqli_stmt_execute($stmt))
 -              printf("[023] [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
 +    if (!$stmt = mysqli_stmt_init($link))
 +        printf("[017] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
  
 -      if (!is_object($tmp = mysqli_stmt_get_result($stmt)))
 -              printf("[024] Expecting object, got %s/%s\n", gettype($tmp), var_export($tmp, 1));
 +    // stmt object status test
 +    try {
 +        mysqli_stmt_get_result($stmt);
 +    } catch (Error $exception) {
 +        echo $exception->getMessage() . "\n";
 +    }
  
 -      if (false !== ($tmp = mysqli_stmt_fetch($stmt)))
 -              printf("[025] false, got %s/%s\n", gettype($tmp), var_export($tmp, 1));
 +    if (!mysqli_stmt_prepare($stmt, "SELECT id, label FROM test ORDER BY id LIMIT 2"))
 +        printf("[019] [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
  
 -      if (true !== ($tmp = mysqli_stmt_bind_result($stmt, $id, $label))) {
 -              printf("[026] [%d] [%s]\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
 -              printf("[027] [%d] [%s]\n", mysqli_errno($link), mysqli_error($link));
 -              printf("[028] Expecting boolean/true, got %s/%s\n", gettype($tmp), var_export($tmp, 1));
 -      }
 +    if (false !== ($tmp = mysqli_stmt_get_result($stmt)))
 +        printf("[020] Expecting false, got %s/%s\n", gettype($tmp), var_export($tmp, 1));
  
 -      if (false !== ($tmp = mysqli_stmt_fetch($stmt)))
 -              printf("[029] false, got %s/%s\n", gettype($tmp), var_export($tmp, 1));
 +    if (!mysqli_stmt_execute($stmt))
 +        printf("[023] [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
  
 -      mysqli_stmt_close($stmt);
 +    if (!is_object($tmp = mysqli_stmt_get_result($stmt)))
 +        printf("[024] Expecting object, got %s/%s\n", gettype($tmp), var_export($tmp, 1));
  
 -      if (!$stmt = mysqli_stmt_init($link))
 -              printf("[032] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 +    if (false !== ($tmp = mysqli_stmt_fetch($stmt)))
 +        printf("[025] false, got %s/%s\n", gettype($tmp), var_export($tmp, 1));
  
 -      if (!mysqli_stmt_prepare($stmt, "SELECT id, label FROM test ORDER BY id LIMIT 2"))
 -              printf("[033] [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
 +    if (true !== ($tmp = mysqli_stmt_bind_result($stmt, $id, $label))) {
 +        printf("[026] [%d] [%s]\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
 +        printf("[027] [%d] [%s]\n", mysqli_errno($link), mysqli_error($link));
 +        printf("[028] Expecting boolean/true, got %s/%s\n", gettype($tmp), var_export($tmp, 1));
 +    }
  
 -      if (!mysqli_stmt_execute($stmt))
 -              printf("[034] [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
 +    if (false !== ($tmp = mysqli_stmt_fetch($stmt)))
 +        printf("[029] false, got %s/%s\n", gettype($tmp), var_export($tmp, 1));
  
 -      $id = NULL;
 -      $label = NULL;
 -      if (true !== ($tmp = mysqli_stmt_bind_result($stmt, $id, $label)))
 -              printf("[035] Expecting boolean/true, got %s/%s\n", gettype($tmp), var_export($tmp, 1));
 +    mysqli_stmt_close($stmt);
  
+     // get_result cannot be used in PS cursor mode
      if (!$stmt = mysqli_stmt_init($link))
-         printf("[032] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+         printf("[030] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
  
      if (!mysqli_stmt_prepare($stmt, "SELECT id, label FROM test ORDER BY id LIMIT 2"))
+         printf("[031] [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
+ 
+     if (!mysqli_stmt_attr_set($stmt, MYSQLI_STMT_ATTR_CURSOR_TYPE, MYSQLI_CURSOR_TYPE_READ_ONLY))
+         printf("[032] [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
+ 
+     if (!mysqli_stmt_execute($stmt))
          printf("[033] [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
  
+     mysqli_report(MYSQLI_REPORT_ERROR | MYSQLI_REPORT_STRICT);
+     try {
+         $res = mysqli_stmt_get_result($stmt);
+         // we expect no segfault if we try to fetch a row because get_result should throw an error or return false
+         mysqli_fetch_assoc($res);
+     } catch (\mysqli_sql_exception $e) {
+         echo $e->getMessage() . "\n";
+     }
+ 
+     try {
+         $res = $stmt->get_result();
+         // we expect no segfault if we try to fetch a row because get_result should throw an error or return false
+         $res->fetch_assoc();
+     } catch (\mysqli_sql_exception $e) {
+         echo $e->getMessage() . "\n";
+     }
+     mysqli_report(MYSQLI_REPORT_OFF);
+ 
+     if (!$stmt = mysqli_stmt_init($link))
+         printf("[034] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+ 
+     if (!mysqli_stmt_prepare($stmt, "SELECT id, label FROM test ORDER BY id LIMIT 2"))
+         printf("[035] [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
+ 
      if (!mysqli_stmt_execute($stmt))
-         printf("[034] [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
+         printf("[036] [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
  
      $id = NULL;
      $label = NULL;
@@@ -139,34 -185,38 +170,36 @@@
      }
      mysqli_free_result($result);
  
-     if (!mysqli_kill($link, mysqli_thread_id($link)))
-         printf("[040] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+       if (!mysqli_kill($link, mysqli_thread_id($link)))
+               printf("[042] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
  
-     if (false !== ($tmp = mysqli_stmt_get_result($stmt)))
-         printf("[041] Expecting false, got %s/%s\n", gettype($tmp), var_export($tmp, 1));
+       if (false !== ($tmp = mysqli_stmt_get_result($stmt)))
+               printf("[043] Expecting false, got %s/%s\n", gettype($tmp), var_export($tmp, 1));
  
-     mysqli_stmt_close($stmt);
+       mysqli_stmt_close($stmt);
  
-     try {
 -      if (false !== ($tmp = mysqli_stmt_fetch($stmt)))
 -              printf("[044] Expecting false, got %s/%s\n", gettype($tmp), var_export($tmp, 1));
++      try {
 +        mysqli_stmt_fetch($stmt);
 +    } catch (Error $exception) {
-         echo $exception->getMessage() . "\n";
++        echo $exception->getMessage(), "\n";
 +    }
  
-     mysqli_close($link);
+       mysqli_close($link);
  
-     print "done!";
+       print "done!";
  ?>
  --CLEAN--
  <?php
 -      require_once("clean_table.inc");
 +    require_once("clean_table.inc");
  ?>
  --EXPECTF--
 -Warning: mysqli_stmt_fetch(): invalid object or resource mysqli_stmt
 - in %s on line %d
 -
 -Warning: mysqli_stmt_fetch(): invalid object or resource mysqli_stmt
 - in %s on line %d
 -
 -Warning: mysqli_stmt_get_result(): invalid object or resource mysqli_stmt
 - in %s on line %d
 +mysqli_stmt object is not fully initialized
 +mysqli_stmt object is not fully initialized
 +mysqli_stmt object is not fully initialized
- [038] [2014] [Commands out of sync; you can't run this command now]
- [039] [0] []
+ mysqli_stmt_get_result() cannot be used with cursors
+ get_result() cannot be used with cursors
+ [040] [2014] [Commands out of sync; you can't run this command now]
+ [041] [0] []
  array(2) {
    ["id"]=>
    int(1)

diff --cc ext/mysqlnd/mysqlnd_ps.c
Simple merge