--- sql/odbc/parser3odbc.C	2001/11/16 12:38:59	1.3
+++ sql/odbc/parser3odbc.C	2002/03/05 15:04:59	1.6
@@ -1,11 +1,11 @@
 /** @file
 	Parser ODBC driver.
 
-	Copyright(c) 2001 ArtLebedev Group(http://www.artlebedev.com)
+	Copyright(c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
 
-	Author: Alexander Petrosyan <paf@design.ru>(http://design.ru/paf)
+	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
-static const char *RCSId="$Id: parser3odbc.C,v 1.3 2001/11/16 12:38:59 paf Exp $"; 
+static const char *RCSId="$Id: parser3odbc.C,v 1.6 2002/03/05 15:04:59 paf Exp $"; 
 
 #ifndef _MSC_VER
 #	error compile ISAPI module with MSVC [no urge for now to make it autoconf-ed (PAF)]
@@ -169,11 +169,16 @@ public:
 						for(int i=0; i<column_count; i++) 						{
 							CString string;
 							rs.GetFieldValue(i, string);
-							size_t size=string.GetLength();
-							void *ptr=0;
-							if(size) {
+							size_t size;
+							void *ptr;
+							if(string.IsEmpty()) {
+								ptr=0;
+								size=0;
+							} else {
+								const char *string_cstr=LPCTSTR(string);
+								size=strlen(string_cstr); //string.GetLength() works wrong with non-string types: 
 								ptr=services.malloc(size);
-								memcpy(ptr, (char *)LPCTSTR(string), size);
+								memcpy(ptr, string_cstr, size);
 							}
 							handlers.add_row_cell(ptr, size);
 						}