From 2b9f42058784bd1fadfceb08e787b8a2720aaaba Mon Sep 17 00:00:00 2001
From: "Christoph M. Becker" <cmbecker69@gmx.de>
Date: Mon, 10 May 2021 14:22:26 +0200
Subject: [PATCH 1/5] XFAIL payload_test.phpt when run with ASan

The test leaks memory for yet unknown reasons.  Maybe these are caused
by a incomplete payload.  For no we mark the test as xfail, to avoid
failing CI for the nightly runs.
---
 ext/pdo_firebird/tests/payload_test.phpt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ext/pdo_firebird/tests/payload_test.phpt b/ext/pdo_firebird/tests/payload_test.phpt
index 6f9ef730f4539..9b07cf509796d 100644
--- a/ext/pdo_firebird/tests/payload_test.phpt
+++ b/ext/pdo_firebird/tests/payload_test.phpt
@@ -4,6 +4,7 @@ FB payload server satisfies connection attempt
 <?php
 if (!extension_loaded('pdo_firebird')) die("skip pdo_firebird extension not available");
 if (!extension_loaded('sockets')) die("skip sockets extension not available");
+if (getenv('SKIP_ASAN')) die('xfail leaks memory FIXME');
 ?>
 --FILE--
 <?php

From 9fd1889c274cd9ec643631ecef3df2f0ac017d7d Mon Sep 17 00:00:00 2001
From: "Christoph M. Becker" <cmbecker69@gmx.de>
Date: Wed, 12 May 2021 13:03:33 +0200
Subject: [PATCH 2/5] Revert "XFAIL payload_test.phpt when run with ASan"

This reverts commit 2b9f42058784bd1fadfceb08e787b8a2720aaaba.
---
 ext/pdo_firebird/tests/payload_test.phpt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ext/pdo_firebird/tests/payload_test.phpt b/ext/pdo_firebird/tests/payload_test.phpt
index 9b07cf509796d..6f9ef730f4539 100644
--- a/ext/pdo_firebird/tests/payload_test.phpt
+++ b/ext/pdo_firebird/tests/payload_test.phpt
@@ -4,7 +4,6 @@ FB payload server satisfies connection attempt
 <?php
 if (!extension_loaded('pdo_firebird')) die("skip pdo_firebird extension not available");
 if (!extension_loaded('sockets')) die("skip sockets extension not available");
-if (getenv('SKIP_ASAN')) die('xfail leaks memory FIXME');
 ?>
 --FILE--
 <?php

From 9e0c9e5263cd0e7583d3dbc975ee8999cd8d5009 Mon Sep 17 00:00:00 2001
From: "Christoph M. Becker" <cmbecker69@gmx.de>
Date: Wed, 12 May 2021 13:06:35 +0200
Subject: [PATCH 3/5] Add general LSan suppression for isc_attach_database()

---
 azure/lsan-suppressions.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/azure/lsan-suppressions.txt b/azure/lsan-suppressions.txt
index 5c2ee76e4607a..ca76d1275d582 100644
--- a/azure/lsan-suppressions.txt
+++ b/azure/lsan-suppressions.txt
@@ -1 +1,2 @@
 leak:acommon::DictInfoList::elements
+leak:isc_attach_database

From 6fe7b5a0422729319a9129421476895e230b0b59 Mon Sep 17 00:00:00 2001
From: "Christoph M. Becker" <cmbecker69@gmx.de>
Date: Wed, 12 May 2021 17:20:15 +0200
Subject: [PATCH 4/5] Revert "Add general LSan suppression for
 isc_attach_database()"

This reverts commit 9e0c9e5263cd0e7583d3dbc975ee8999cd8d5009.
---
 azure/lsan-suppressions.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/azure/lsan-suppressions.txt b/azure/lsan-suppressions.txt
index ca76d1275d582..5c2ee76e4607a 100644
--- a/azure/lsan-suppressions.txt
+++ b/azure/lsan-suppressions.txt
@@ -1,2 +1 @@
 leak:acommon::DictInfoList::elements
-leak:isc_attach_database

From 678bdd8a7a3293647c9b4458c2c99b85215392b5 Mon Sep 17 00:00:00 2001
From: "Christoph M. Becker" <cmbecker69@gmx.de>
Date: Wed, 12 May 2021 17:54:04 +0200
Subject: [PATCH 5/5] Disable LSan for all PDO_Firebird tests

---
 ext/pdo_firebird/tests/bug_47415.phpt    | 2 ++
 ext/pdo_firebird/tests/bug_48877.phpt    | 2 ++
 ext/pdo_firebird/tests/bug_53280.phpt    | 2 ++
 ext/pdo_firebird/tests/bug_62024.phpt    | 2 ++
 ext/pdo_firebird/tests/bug_64037.phpt    | 2 ++
 ext/pdo_firebird/tests/bug_72583.phpt    | 2 ++
 ext/pdo_firebird/tests/bug_72931.phpt    | 2 ++
 ext/pdo_firebird/tests/bug_73087.phpt    | 2 ++
 ext/pdo_firebird/tests/bug_74462.phpt    | 2 ++
 ext/pdo_firebird/tests/bug_76488.phpt    | 2 ++
 ext/pdo_firebird/tests/bug_77863.phpt    | 2 ++
 ext/pdo_firebird/tests/bug_aaa.phpt      | 2 ++
 ext/pdo_firebird/tests/common.phpt       | 1 +
 ext/pdo_firebird/tests/connect.phpt      | 2 ++
 ext/pdo_firebird/tests/ddl.phpt          | 2 ++
 ext/pdo_firebird/tests/dialect_1.phpt    | 2 ++
 ext/pdo_firebird/tests/execute.phpt      | 2 ++
 ext/pdo_firebird/tests/payload_test.phpt | 2 ++
 ext/pdo_firebird/tests/rowCount.phpt     | 2 ++
 19 files changed, 37 insertions(+)

diff --git a/ext/pdo_firebird/tests/bug_47415.phpt b/ext/pdo_firebird/tests/bug_47415.phpt
index 4b8c14d8909b6..a1daf78054f28 100644
--- a/ext/pdo_firebird/tests/bug_47415.phpt
+++ b/ext/pdo_firebird/tests/bug_47415.phpt
@@ -2,6 +2,8 @@
 Bug #47415 PDO_Firebird segfaults when passing lowercased column name to bindColumn()
 --SKIPIF--
 <?php require('skipif.inc'); ?>
+--ENV--
+LSAN_OPTIONS=detect_leaks=0 
 --FILE--
 <?php
 require 'testdb.inc';
diff --git a/ext/pdo_firebird/tests/bug_48877.phpt b/ext/pdo_firebird/tests/bug_48877.phpt
index d685d0ac80cf8..d3d3b82ee1d3c 100644
--- a/ext/pdo_firebird/tests/bug_48877.phpt
+++ b/ext/pdo_firebird/tests/bug_48877.phpt
@@ -2,6 +2,8 @@
 PDO_Firebird: bug 48877 The "bindValue" and "bindParam" do not work for PDO Firebird if we use named parameters (:parameter).
 --SKIPIF--
 <?php require('skipif.inc'); ?>
+--ENV--
+LSAN_OPTIONS=detect_leaks=0 
 --FILE--
 <?php
 
diff --git a/ext/pdo_firebird/tests/bug_53280.phpt b/ext/pdo_firebird/tests/bug_53280.phpt
index 645f7b3c87a5e..eb6f922a7a74b 100644
--- a/ext/pdo_firebird/tests/bug_53280.phpt
+++ b/ext/pdo_firebird/tests/bug_53280.phpt
@@ -2,6 +2,8 @@
 PDO_Firebird: bug 53280 segfaults if query column count is less than param count
 --SKIPIF--
 <?php require('skipif.inc'); ?>
+--ENV--
+LSAN_OPTIONS=detect_leaks=0 
 --FILE--
 <?php
 
diff --git a/ext/pdo_firebird/tests/bug_62024.phpt b/ext/pdo_firebird/tests/bug_62024.phpt
index 425a21f177d6b..46e36fe65e7c4 100644
--- a/ext/pdo_firebird/tests/bug_62024.phpt
+++ b/ext/pdo_firebird/tests/bug_62024.phpt
@@ -2,6 +2,8 @@
 Bug #62024 Cannot insert second row with null using parametrized query (Firebird PDO)
 --SKIPIF--
 <?php require('skipif.inc'); ?>
+--ENV--
+LSAN_OPTIONS=detect_leaks=0 
 --FILE--
 <?php
 
diff --git a/ext/pdo_firebird/tests/bug_64037.phpt b/ext/pdo_firebird/tests/bug_64037.phpt
index 6fadab4000d8e..28b636e8c5e02 100644
--- a/ext/pdo_firebird/tests/bug_64037.phpt
+++ b/ext/pdo_firebird/tests/bug_64037.phpt
@@ -2,6 +2,8 @@
 Bug #64037 Firebird return wrong value for numeric field
 --SKIPIF--
 <?php require('skipif.inc'); ?>
+--ENV--
+LSAN_OPTIONS=detect_leaks=0 
 --FILE--
 <?php
 
diff --git a/ext/pdo_firebird/tests/bug_72583.phpt b/ext/pdo_firebird/tests/bug_72583.phpt
index 87bc481fdcf86..bda5de044250f 100644
--- a/ext/pdo_firebird/tests/bug_72583.phpt
+++ b/ext/pdo_firebird/tests/bug_72583.phpt
@@ -2,6 +2,8 @@
 PDO_Firebird: Feature 72583 Fetch integers as php integers not as strings
 --SKIPIF--
 <?php require('skipif.inc'); ?>
+--ENV--
+LSAN_OPTIONS=detect_leaks=0 
 --FILE--
 <?php
 require 'testdb.inc';
diff --git a/ext/pdo_firebird/tests/bug_72931.phpt b/ext/pdo_firebird/tests/bug_72931.phpt
index 56270ba984ba0..6c36090cbd133 100644
--- a/ext/pdo_firebird/tests/bug_72931.phpt
+++ b/ext/pdo_firebird/tests/bug_72931.phpt
@@ -2,6 +2,8 @@
 PDO_Firebird: Bug 72931 Insert returning fails on Firebird 3
 --SKIPIF--
 <?php require('skipif.inc'); ?>
+--ENV--
+LSAN_OPTIONS=detect_leaks=0 
 --FILE--
 <?php
 require 'testdb.inc';
diff --git a/ext/pdo_firebird/tests/bug_73087.phpt b/ext/pdo_firebird/tests/bug_73087.phpt
index b676293e445da..6c32b6a5b95db 100644
--- a/ext/pdo_firebird/tests/bug_73087.phpt
+++ b/ext/pdo_firebird/tests/bug_73087.phpt
@@ -2,6 +2,8 @@
 PDO_Firebird: bug 73087 segfault binding blob parameter
 --SKIPIF--
 <?php require('skipif.inc'); ?>
+--ENV--
+LSAN_OPTIONS=detect_leaks=0 
 --FILE--
 <?php
 require 'testdb.inc';
diff --git a/ext/pdo_firebird/tests/bug_74462.phpt b/ext/pdo_firebird/tests/bug_74462.phpt
index fe97a1fc19f28..2b0b2ecee7afe 100644
--- a/ext/pdo_firebird/tests/bug_74462.phpt
+++ b/ext/pdo_firebird/tests/bug_74462.phpt
@@ -2,6 +2,8 @@
 PDO_Firebird: Bug #74462 Returns only NULLs for boolean fields
 --SKIPIF--
 <?php require('skipif.inc'); ?>
+--ENV--
+LSAN_OPTIONS=detect_leaks=0 
 --FILE--
 <?php
 require 'testdb.inc';
diff --git a/ext/pdo_firebird/tests/bug_76488.phpt b/ext/pdo_firebird/tests/bug_76488.phpt
index ffcca7efd3468..2f976a593b526 100644
--- a/ext/pdo_firebird/tests/bug_76488.phpt
+++ b/ext/pdo_firebird/tests/bug_76488.phpt
@@ -2,6 +2,8 @@
 PDO_Firebird: Bug #76488 Memory leak when fetching a BLOB field
 --SKIPIF--
 <?php require('skipif.inc'); ?>
+--ENV--
+LSAN_OPTIONS=detect_leaks=0 
 --FILE--
 <?php
 require 'testdb.inc';
diff --git a/ext/pdo_firebird/tests/bug_77863.phpt b/ext/pdo_firebird/tests/bug_77863.phpt
index a133de5ba8d3f..406708e276c4a 100644
--- a/ext/pdo_firebird/tests/bug_77863.phpt
+++ b/ext/pdo_firebird/tests/bug_77863.phpt
@@ -2,6 +2,8 @@
 PDO_Firebird: Bug #76488 PDO Firebird does not support boolean datatype in input parameters
 --SKIPIF--
 <?php require('skipif.inc'); ?>
+--ENV--
+LSAN_OPTIONS=detect_leaks=0 
 --FILE--
 <?php
 
diff --git a/ext/pdo_firebird/tests/bug_aaa.phpt b/ext/pdo_firebird/tests/bug_aaa.phpt
index 2849cef36cb82..16fb03c958e6e 100644
--- a/ext/pdo_firebird/tests/bug_aaa.phpt
+++ b/ext/pdo_firebird/tests/bug_aaa.phpt
@@ -2,6 +2,8 @@
 PDO_Firebird: cursor should not be marked as opened on singleton statements
 --SKIPIF--
 <?php require('skipif.inc'); ?>
+--ENV--
+LSAN_OPTIONS=detect_leaks=0 
 --FILE--
 <?php
 require 'testdb.inc';
diff --git a/ext/pdo_firebird/tests/common.phpt b/ext/pdo_firebird/tests/common.phpt
index 00d4b239ab671..4dc3c0b24e48b 100644
--- a/ext/pdo_firebird/tests/common.phpt
+++ b/ext/pdo_firebird/tests/common.phpt
@@ -7,6 +7,7 @@ if (!extension_loaded('pdo_firebird')) print 'skip'; ?>
 # magic auto-configuration
 
 $config = array(
+	'ENV' => ['LSAN_OPTIONS' => 'detect_leaks=0'],
 	'TESTS' => 'ext/pdo/tests'
 );
 	
diff --git a/ext/pdo_firebird/tests/connect.phpt b/ext/pdo_firebird/tests/connect.phpt
index 20f0ce7013fe8..c1e04d33ed5de 100644
--- a/ext/pdo_firebird/tests/connect.phpt
+++ b/ext/pdo_firebird/tests/connect.phpt
@@ -2,6 +2,8 @@
 PDO_Firebird: connect/disconnect
 --SKIPIF--
 <?php require('skipif.inc'); ?>
+--ENV--
+LSAN_OPTIONS=detect_leaks=0 
 --FILE--
 <?php
 	require("testdb.inc");
diff --git a/ext/pdo_firebird/tests/ddl.phpt b/ext/pdo_firebird/tests/ddl.phpt
index b89c70456a48e..45812ca958911 100644
--- a/ext/pdo_firebird/tests/ddl.phpt
+++ b/ext/pdo_firebird/tests/ddl.phpt
@@ -2,6 +2,8 @@
 PDO_Firebird: DDL/transactions
 --SKIPIF--
 <?php require('skipif.inc'); ?>
+--ENV--
+LSAN_OPTIONS=detect_leaks=0 
 --FILE--
 <?php
 
diff --git a/ext/pdo_firebird/tests/dialect_1.phpt b/ext/pdo_firebird/tests/dialect_1.phpt
index 829025c16229a..8dccf3c069cfa 100644
--- a/ext/pdo_firebird/tests/dialect_1.phpt
+++ b/ext/pdo_firebird/tests/dialect_1.phpt
@@ -6,6 +6,8 @@ if (strpos(getenv('PDO_FIREBIRD_TEST_DSN'), 'dialect=1')===false) {
     die('skip: PDO_FIREBIRD_TEST_DSN must contain a string "dialect=1"');
 }
 ?>
+--ENV--
+LSAN_OPTIONS=detect_leaks=0 
 --FILE--
 <?php
 	require("testdb.inc");
diff --git a/ext/pdo_firebird/tests/execute.phpt b/ext/pdo_firebird/tests/execute.phpt
index 0f1721f559ddd..4054818049298 100644
--- a/ext/pdo_firebird/tests/execute.phpt
+++ b/ext/pdo_firebird/tests/execute.phpt
@@ -2,6 +2,8 @@
 PDO_Firebird: prepare/execute/binding
 --SKIPIF--
 <?php require('skipif.inc'); ?>
+--ENV--
+LSAN_OPTIONS=detect_leaks=0 
 --FILE--
 <?php
 	require("testdb.inc");
diff --git a/ext/pdo_firebird/tests/payload_test.phpt b/ext/pdo_firebird/tests/payload_test.phpt
index 6f9ef730f4539..67809b880980a 100644
--- a/ext/pdo_firebird/tests/payload_test.phpt
+++ b/ext/pdo_firebird/tests/payload_test.phpt
@@ -5,6 +5,8 @@ FB payload server satisfies connection attempt
 if (!extension_loaded('pdo_firebird')) die("skip pdo_firebird extension not available");
 if (!extension_loaded('sockets')) die("skip sockets extension not available");
 ?>
+--ENV--
+LSAN_OPTIONS=detect_leaks=0 
 --FILE--
 <?php
 require_once "payload_server.inc";
diff --git a/ext/pdo_firebird/tests/rowCount.phpt b/ext/pdo_firebird/tests/rowCount.phpt
index 81982e96b92ce..1edc59d68d0e4 100644
--- a/ext/pdo_firebird/tests/rowCount.phpt
+++ b/ext/pdo_firebird/tests/rowCount.phpt
@@ -2,6 +2,8 @@
 PDO_Firebird: rowCount
 --SKIPIF--
 <?php require('skipif.inc'); ?>
+--ENV--
+LSAN_OPTIONS=detect_leaks=0 
 --FILE--
 <?php