From: Sebastian Pop <spop@amazon.com>
Date: Fri, 21 Jun 2019 07:15:35 +0000 (+0000)
Subject: Fix compilation errors when building against libmysql
X-Git-Tag: php-7.4.0alpha3~139
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=70ef87539d7723e22ec3659a3ac2bec0511d12f9;p=php

Fix compilation errors when building against libmysql

Closes GH-4316.
---

diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c
index 93071c2d0c..bffb695795 100644
--- a/ext/mysqli/mysqli_api.c
+++ b/ext/mysqli/mysqli_api.c
@@ -970,7 +970,7 @@ void mysqli_stmt_fetch_libmysql(INTERNAL_FUNCTION_PARAMETERS)
 			zval *result;
 			/* it must be a reference, isn't it? */
 			if (Z_ISREF(stmt->result.vars[i])) {
-				result = stmt->result.vars[i];
+				result = &stmt->result.vars[i];
 			} else {
 				continue; // but be safe ...
 			}
@@ -1083,7 +1083,7 @@ void mysqli_stmt_fetch_libmysql(INTERNAL_FUNCTION_PARAMETERS)
 						break;
 				}
 			} else {
-				ZEND_TRY_REF_ASSIGN_NULL(result);
+				ZEND_TRY_ASSIGN_REF_NULL(result);
 			}
 		}
 	} else {