--- sql/oracle/parser3oracle.C	2003/01/21 15:51:29	1.29
+++ sql/oracle/parser3oracle.C	2003/10/07 05:58:04	1.37
@@ -7,7 +7,7 @@
 
 	2001.07.30 using Oracle 8.1.6 [@test tested with Oracle 7.x.x]
 */
-static const char *RCSId="$Id: parser3oracle.C,v 1.29 2003/01/21 15:51:29 paf Exp $"; 
+static const char *RCSId="$Id: parser3oracle.C,v 1.37 2003/10/07 05:58:04 paf Exp $"; 
 
 #include "config_includes.h"
 
@@ -38,7 +38,7 @@ inline int max(int a, int b) { return a>
 inline int min(int a, int b){ return a<b?a:b; }
 #endif
 
-/// @test setenv version memory. maybe key/value needs ::malloc?
+/// @todo small memory leaks here
 static int pa_setenv(const char *name, const char *value, bool do_append) {
 	const char *prev_value=0;
 	if(do_append)
@@ -184,7 +184,7 @@ static sb4 cbf_get_data(dvoid *ctxp,
 						ub1 *piecep, 
 						dvoid **indpp, 
 						ub2 **rcodepp);
-void tolower(char *out, const char *in, size_t size);
+void tolower(char *out, const char *in);
 
 /**
 	OracleSQL server driver
@@ -360,22 +360,21 @@ public:
 		return true;
 	}
 
-	unsigned int quote(
-		SQL_Driver_services&, void *, 
-		char *to, const char *from, unsigned int length) {
-		if(to) { // store mode
-			unsigned int result=length;
-			while(length--) {
-				switch(*from) {
-				case '\'': // "'" -> "''"
-					*to++='\''; result++;
-					break;
-				}
-				*to++=*from++;
+	const char* quote(
+		SQL_Driver_services& services, void *connection,
+		const char *from, unsigned int length) {
+		char *result=(char*)services.malloc_atomic(length*2+1);
+		char *to=result;
+		while(length--) {
+			switch(*from) {
+			case '\'': // "'" -> "''"
+				*to++='\'';
+				break;
 			}
-			return result;
-		} else // estimate mode
-			return length*2;
+			*to++=*from++;
+		}
+		*to=0;
+		return result;
 	}
 	void query(
 		SQL_Driver_services& services, void *connection, 
@@ -455,7 +454,7 @@ private: // private funcs
 		const char *astatement, OracleSQL_query_lobs &lobs) {
 		size_t statement_size=strlen(astatement);
 
-		char *result=(char *)services.malloc(statement_size
+		char *result=(char *)services.malloc_atomic(statement_size
 			+MAX_STRING // in case of short 'strings'
 			+11/* returning */+6/* into */+(MAX_LOB_NAME_LENGTH+2/*:, */)*2/*ret into*/*MAX_IN_LOBS
 			+1);
@@ -468,6 +467,7 @@ private: // private funcs
 				o[0]=='/' &&
 				o[1]=='*' && 
 				o[2]=='*') { // name start
+				const char* saved_o=o;
 				o+=3;
 				const char *name_begin=o;
 				while(*o)
@@ -476,11 +476,12 @@ private: // private funcs
 						o[1]=='*' &&
 						o[2]=='/' &&
 						o[3]=='\'') { // name end
+						saved_o=0; // found, marking that
 						const char *name_end=o;
 						o+=4;
 						OracleSQL_query_lobs::Item &item=lobs.items[lobs.count++];
 						item.name_ptr=name_begin; item.name_size=name_end-name_begin;
-						item.data_ptr=(char *)services.malloc(statement_size/*max*/); item.data_size=0;
+						item.data_ptr=(char *)services.malloc_atomic(statement_size/*max*/); item.data_size=0;
 
 						const char *start=o;
 						bool escaped=false;
@@ -507,6 +508,10 @@ private: // private funcs
 						break;
 					} else
 						o++; // /**skip**/'xxx'
+				if(saved_o) {
+					o=saved_o;
+					*n++=*o++;
+				}
 			} else
 				*n++=*o++;
 		}
@@ -657,10 +662,9 @@ private: // private funcs
 					(OCIError *)cs.errhp));
 				
 				{
-					size_t size=(size_t)col_name_len;
-					char *ptr=(char *)services.malloc(size);
-					tolower(ptr, (char *)col_name, size);
-					check(cs, handlers.add_column(cs.sql_error, ptr, size));
+					char *ptr=(char *)services.malloc_atomic(col_name_len+1);
+					tolower(ptr, (char *)col_name);
+					check(cs, handlers.add_column(cs.sql_error, ptr, col_name_len));
 				}
 				
 				ub2 coerce_type=dtype;
@@ -680,7 +684,7 @@ private: // private funcs
 					}
 				default:
 					coerce_type=SQLT_STR;
-					ptr=cols[column_count-1].str=(char *)services.malloc(MAX_OUT_STRING_LENGTH+1);
+					ptr=cols[column_count-1].str=(char *)services.malloc_atomic(MAX_OUT_STRING_LENGTH+1);
 					size=MAX_OUT_STRING_LENGTH;
 					break;
 				}
@@ -706,8 +710,8 @@ private: // private funcs
 				if(row>=offset) {
 					check(cs, handlers.add_row(cs.sql_error));
 					for(int i=0; i<column_count; i++) {
-						size_t size=0;
-						void *ptr=0;
+						size_t length=0;
+						char* str=0;
 						if(!cols[i].indicator) // not NULL
 							switch(cols[i].type) {
 							case SQLT_CLOB: 
@@ -718,28 +722,29 @@ private: // private funcs
 									OCILobLocator *var=(OCILobLocator *)cols[i].var;
 									OCILobGetLength(cs.svchp, cs.errhp, var, &loblen);
 									if(loblen) {
-										size=(size_t)loblen;
-										ptr=services.malloc(size);
+										length=(size_t)loblen;
+										str=(char*)services.malloc_atomic(length+1);
 										check(cs, "lobread", OCILobRead(cs.svchp, cs.errhp, 
-											var, &amtp, offset, (dvoid *) ptr, 
+											var, &amtp, offset, (dvoid *) str, 
 											loblen, (dvoid *)0, 
 											0, 
 											(ub2)0, (ub1) SQLCS_IMPLICIT));
+										str[length]=0;
 									}
 									break;
 								}
 							default:
-								if(const char *str=cols[i].str) {
-									size=strlen(str);
-									ptr=services.malloc(size);
-									memcpy(ptr, str, size);
+								if(const char *value=cols[i].str) {
+									length=strlen(value);
+									str=(char*)services.malloc_atomic(length+1);
+									memcpy(str, value, length+1);
 								} else {
-									size=0;
-									ptr=0;
+									length=0;
+									str=0;
 								}
 								break;
 							}
-						check(cs, handlers.add_row_cell(cs.sql_error, ptr, size));
+						check(cs, handlers.add_row_cell(cs.sql_error, str, length));
 					}
 				}
 			}
@@ -993,7 +998,7 @@ static sb4 cbf_get_data(dvoid *ctxp,
 				(ub4 *)sizeof(ub2), OCI_ATTR_ROWS_RETURNED, context.cs->errhp))	;
 		context.rows->count=(ub2)rows;
 		context.rows->row=(OracleSQL_query_lobs::return_rows::return_row *)
-			context.services->malloc(sizeof(OracleSQL_query_lobs::return_rows::return_row)*rows);
+			context.services->malloc_atomic(sizeof(OracleSQL_query_lobs::return_rows::return_row)*rows);
 	}
 
 	OracleSQL_query_lobs::return_rows::return_row &var=context.rows->row[index];
@@ -1012,12 +1017,12 @@ static sb4 cbf_get_data(dvoid *ctxp,
 	return OCI_CONTINUE;
 }
 
-void tolower(char *out, const char *in, size_t size) {
-	while(size--)
-		*out++=tolower(*in++);
+void tolower(char *out, const char *in) {
+	while(char c=*in++)
+		*out++=tolower(c);
+	*out=0;
 }
 
 extern "C" SQL_Driver *SQL_DRIVER_CREATE() {
-	//_asm int 3;
 	return OracleSQL_driver=new OracleSQL_Driver();
 }