--- parser3/src/classes/hash.C 2009/06/16 07:36:01 1.95 +++ parser3/src/classes/hash.C 2009/06/20 02:16:00 1.96 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_HASH_C="$Date: 2009/06/16 07:36:01 $"; +static const char * const IDENT_HASH_C="$Date: 2009/06/20 02:16:00 $"; #include "classes.h" #include "pa_vmethod_frame.h" @@ -74,9 +74,9 @@ public: empty(0) { } - bool add_column(SQL_Error& error, const char* str, size_t) { + bool add_column(SQL_Error& error, const char* str, size_t length) { try { - columns+=new String(str, String::L_TAINTED); + columns+=new String(str, String::L_TAINTED, length); return false; } catch(...) { error=SQL_Error("exception occured in Hash_sql_event_handlers::add_column"); @@ -113,9 +113,9 @@ public: return false; } - bool add_row_cell(SQL_Error& error, const char *ptr, size_t) { + bool add_row_cell(SQL_Error& error, const char *ptr, size_t length) { try { - String& cell=*new String(ptr, String::L_TAINTED); + String& cell=*new String(ptr, String::L_TAINTED, length); bool duplicate=false; if(one_bool_column) { @@ -431,8 +431,8 @@ static bool one_foreach_cycle( Foreach_info *info) { Value& var_context=*info->var_context; if(info->key_var_name){ - VString* vkey=new VString(*new String(akey, String::L_TAINTED)); - var_context.put_element(var_context, *info->key_var_name, vkey, false); + VString* vkey=new VString(*new String(akey, String::L_TAINTED)); + var_context.put_element(var_context, *info->key_var_name, vkey, false); } if(info->value_var_name) var_context.put_element(var_context, *info->value_var_name, avalue, false);