summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYasuo Ohgaki <yohgaki@php.net>2013-10-26 10:31:21 +0900
committerYasuo Ohgaki <yohgaki@php.net>2013-10-26 10:31:21 +0900
commite50eb1ce3408d15cd26fd88203c68f52e59f6b0b (patch)
treeaabd59ea1730ebb5714efc871e06f0eb7c3a420f
parent1f5b1cfb2b238b282c48adb663aaa084e28290c0 (diff)
downloadphp-git-e50eb1ce3408d15cd26fd88203c68f52e59f6b0b.tar.gz
Fixed bug #65950 Field name truncation if the field name is bigger than 32 characters
-rw-r--r--NEWS4
-rw-r--r--ext/odbc/php_odbc_includes.h2
2 files changed, 5 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 9439136ef6..26a9aa9ff4 100644
--- a/NEWS
+++ b/NEWS
@@ -16,6 +16,10 @@ PHP NEWS
- FTP:
. Fixed bug #65667 (ftp_nb_continue produces segfault). (Philip Hofstetter)
+- ODBC
+ . Fixed bug #65950 (Field name truncation if the field name is bigger than
+ 32 characters). (patch submitted by: michael dot y at zend dot com, Yasuo)
+
- Sockets:
. Fixed bug #65808 (the socket_connect() won't work with IPv6 address).
(Mike)
diff --git a/ext/odbc/php_odbc_includes.h b/ext/odbc/php_odbc_includes.h
index ca237c0537..c00583b16a 100644
--- a/ext/odbc/php_odbc_includes.h
+++ b/ext/odbc/php_odbc_includes.h
@@ -232,7 +232,7 @@ typedef struct odbc_connection {
} odbc_connection;
typedef struct odbc_result_value {
- char name[32];
+ char name[256];
char *value;
SQLLEN vallen;
SQLLEN coltype;