summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlia Alshanetsky <iliaa@php.net>2004-09-28 14:07:59 +0000
committerIlia Alshanetsky <iliaa@php.net>2004-09-28 14:07:59 +0000
commitcbfa37cfad74f74bb2f8009729dfd132a9b056a4 (patch)
tree2620540b28ed8c732eb4d8a91e0cd9bbb8b88c4b
parent797cda2555dca1ae25d043eefc96f52d8f232bb8 (diff)
downloadphp-git-cbfa37cfad74f74bb2f8009729dfd132a9b056a4.tar.gz
MFH: Fixed bug #30224 (Sybase date strings are sometimes not null
terminated).
-rw-r--r--NEWS2
-rw-r--r--ext/mssql/php_mssql.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 32b02bca46..9d05674e75 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2004, PHP 5.0.3
+- Fixed bug #30224 (Sybase date strings are sometimes not null terminated).
+ (Ilia)
- Fixed bug #30147 (OO sqlite_fetch_object did not reset error handler). (Wez)
- Fixed bug #30133 (get_current_user() crashes on Windows). (Edin)
- Fixed bug #30057 (did not detect IPV6 on FreeBSD 4.1). (Wez)
diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c
index 9930d3d0e4..74a3fe3d1c 100644
--- a/ext/mssql/php_mssql.c
+++ b/ext/mssql/php_mssql.c
@@ -862,6 +862,7 @@ static void php_mssql_get_column_content_with_type(mssql_link *mssql_ptr,int off
res_buf = (unsigned char *) emalloc(res_length+1);
res_length = dbconvert(NULL,coltype(offset),dbdata(mssql_ptr->link,offset), res_length, SQLCHAR,res_buf,-1);
+ res_buf[res_length] = '\0';
} else {
if (column_type == SQLDATETIM4) {
DBDATETIME temp;
@@ -931,7 +932,7 @@ static void php_mssql_get_column_content_without_type(mssql_link *mssql_ptr,int
res_buf = (unsigned char *) emalloc(res_length+1);
res_length = dbconvert(NULL,coltype(offset),dbdata(mssql_ptr->link,offset), res_length, SQLCHAR, res_buf, -1);
-
+ res_buf[res_length] = '\0';
} else {
if (column_type == SQLDATETIM4) {
DBDATETIME temp;