From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Wed, 28 Aug 2019 16:10:33 +0000 (+0200)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8417bc19b8cc9d2d4884128817328b7ab75433c1;p=php

Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix #78473: odbc_close() closes arbitrary resources
---

8417bc19b8cc9d2d4884128817328b7ab75433c1
diff --cc ext/odbc/tests/bug78473.phpt
index 0000000000,fd73b6cc07..c595d51fad
mode 000000,100644..100644
--- a/ext/odbc/tests/bug78473.phpt
+++ b/ext/odbc/tests/bug78473.phpt
@@@ -1,0 -1,14 +1,18 @@@
+ --TEST--
+ Bug #78473 (odbc_close() closes arbitrary resources)
+ --SKIPIF--
+ <?php
+ if (!extension_loaded('odbc')) die('skip odbc extension not available');
+ ?>
+ --FILE--
+ <?php
 -odbc_close(STDIN);
++try {
++    odbc_close(STDIN);
++} catch (TypeError $err) {
++    echo $err->getMessage(), PHP_EOL;
++}
+ var_dump(STDIN);
+ ?>
+ --EXPECTF--
 -Warning: odbc_close(): supplied resource is not a valid ODBC-Link resource in %s on line %d
++odbc_close(): supplied resource is not a valid ODBC-Link resource
+ resource(%d) of type (stream)