--- sql/pgsql/parser3pgsql.C	2003/03/26 14:09:06	1.12.6.1
+++ sql/pgsql/parser3pgsql.C	2003/07/23 13:21:12	1.12.6.2
@@ -7,7 +7,7 @@
 
 	2001.07.30 using PgSQL 7.1.2
 */
-static const char *RCSId="$Id: parser3pgsql.C,v 1.12.6.1 2003/03/26 14:09:06 paf Exp $"; 
+static const char *RCSId="$Id: parser3pgsql.C,v 1.12.6.2 2003/07/23 13:21:12 paf Exp $"; 
 
 #include "config_includes.h"
 
@@ -239,9 +239,9 @@ public:
 		for(int i=0; i<column_count; i++){
 			char *name=PQfname(res, i);
 			size_t size=strlen(name);
-			void *ptr=services.malloc(size);
-			memcpy(ptr, name, size);
-			CHECK(handlers.add_column(sql_error, ptr, size));
+			char* str=(char*)services.malloc(size+1);
+			memcpy(str, name, size+1);
+			CHECK(handlers.add_column(sql_error, str, size));
 		}
 
 		CHECK(handlers.before_rows(sql_error));
@@ -252,7 +252,7 @@ public:
 				for(int i=0; i<column_count; i++){
 					const char *cell=PQgetvalue(res, r, i);
 					size_t size;
-					void *ptr;
+					char* str;
 					if(PQftype(res, i)==OIDOID) {
 						// ObjectID column, read object bytes
 
@@ -273,11 +273,11 @@ public:
 							size=(size_t)size_tell;
 							if(size) {
 								// read 
-								ptr=services.malloc(size);
-								if(!lo_read_ex(conn, fd, (const char *)ptr, size_tell))
+								str=(char*)services.malloc(size+1);
+								if(!lo_read_ex(conn, fd, str, size_tell))
 									PQclear_throw("lo_read can not read all bytes of object");
 							} else
-								ptr=0;
+								str=0;
 							if(lo_close(conn, fd)<0)
 								PQclear_throwPQerror;
 						} else
@@ -286,12 +286,12 @@ public:
 						// normal column, read it normally
 						size=(size_t)PQgetlength(res, r, i);
 						if(size) {
-							ptr=services.malloc(size);
-							memcpy(ptr, cell, size);
+							str=(char*)services.malloc(size+1);
+							memcpy(str, cell, size+1);
 						} else
-							ptr=0;
+							str=0;
 					}
-					CHECK(handlers.add_row_cell(sql_error, ptr, size));
+					CHECK(handlers.add_row_cell(sql_error, str, size));
 				}
 			}
 cleanup: