From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Wed, 17 Mar 2021 14:09:18 +0000 (+0100)
Subject: Initalize return_value before use
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=128082c86fd024fad25c71f4013f8ed55a43f5e4;p=php

Initalize return_value before use

Otherwise we likely segfault[1].  We fix the same issue for
PDO_Firebird as well.

[1] <https://ci.appveyor.com/project/php/php-src/builds/38267250/job/6y3ngn1k6ryxx6j3?fullLog=true#L9783>

Closes GH-6785.
---

diff --git a/ext/pdo_firebird/firebird_statement.c b/ext/pdo_firebird/firebird_statement.c
index c0ce2618ac..7fad08e2ad 100644
--- a/ext/pdo_firebird/firebird_statement.c
+++ b/ext/pdo_firebird/firebird_statement.c
@@ -243,6 +243,7 @@ static int firebird_stmt_get_column_meta(pdo_stmt_t *stmt, zend_long colno, zval
 		}
 	}
 
+	array_init(return_value);
 	add_assoc_long(return_value, "pdo_type", param_type);
 	return 1;
 }
diff --git a/ext/pdo_odbc/odbc_stmt.c b/ext/pdo_odbc/odbc_stmt.c
index f71d539271..a80aab9a88 100644
--- a/ext/pdo_odbc/odbc_stmt.c
+++ b/ext/pdo_odbc/odbc_stmt.c
@@ -627,6 +627,7 @@ static int odbc_stmt_describe(pdo_stmt_t *stmt, int colno)
 
 static int odbc_stmt_get_column_meta(pdo_stmt_t *stmt, zend_long colno, zval *return_value)
 {
+	array_init(return_value);
 	add_assoc_long(return_value, "pdo_type", PDO_PARAM_STR);
 	return 1;
 }