Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:61410
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Received-SPF: pass (pb1.pair.com: domain redhat.com designates 209.132.183.28 as permitted sender)
Date: Wed, 18 Jul 2012 16:48:07 +0100
To: internals@lists.php.net
Cc: mosvald@redhat.com
Message-ID: <20120718154807.GA13890@redhat.com>
Mail-Followup-To: internals@lists.php.net, mosvald@redhat.com
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="yrj/dFKFPuw6o+aM"
Content-Disposition: inline
User-Agent: Mutt/1.5.21 (2010-09-15)
Organization: Registered in England and Wales under Company Registration No. 03798903
  Directors: Michael Cunningham (USA), Mark Hegarty (Ireland), Matt Parson (USA), Charlie Peters (USA)
Subject: [PATCH] pdo_odbc: fix pdo_odbc_error's use of SQLGetDiagRec()
From: jorton@redhat.com (Joe Orton)

--yrj/dFKFPuw6o+aM
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline

The "state" parameter passed to SQLGetDiagRec() needs to be six bytes 
not 5; the attached patch fixes this, from Martin Osvald.

--yrj/dFKFPuw6o+aM
Content-Type: text/plain; charset=utf-8
Content-Disposition: attachment; filename=diff

diff --git a/ext/pdo_odbc/odbc_driver.c b/ext/pdo_odbc/odbc_driver.c
index 84a147b..ca2808c 100755
--- a/ext/pdo_odbc/odbc_driver.c
+++ b/ext/pdo_odbc/odbc_driver.c
@@ -114,7 +114,7 @@ void pdo_odbc_error(pdo_dbh_t *dbh, pdo_stmt_t *stmt, PDO_ODBC_HSTMT statement,
 	 * diagnostic records (which can be generated by PRINT statements
 	 * in the query, for instance). */
 	while (rc == SQL_SUCCESS || rc == SQL_SUCCESS_WITH_INFO) {
-		char discard_state[5];
+		char discard_state[6];
 		char discard_buf[1024];
 		SQLINTEGER code;
 		rc = SQLGetDiagRec(htype, eh, recno++, discard_state, &code,

--yrj/dFKFPuw6o+aM--