--- parser3/src/classes/string.C 2005/11/22 12:15:10 1.142.6.6 +++ parser3/src/classes/string.C 2005/11/22 11:21:35 1.147 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_STRING_C="$Date: 2005/11/22 12:15:10 $"; +static const char * const IDENT_STRING_C="$Date: 2005/11/22 11:21:35 $"; #include "classes.h" #include "pa_vmethod_frame.h" @@ -446,6 +446,10 @@ const String* sql_result_string(Request& } if((default_code=options->get(sql_default_name))) { valid_options++; + if(!default_code->get_junction()) + throw Exception("parser.runtime", + 0, + "default option must be code"); } if(valid_options!=options->count()) throw Exception("parser.runtime", @@ -587,15 +591,15 @@ static void _base64(Request& r, MethodPa if(params.count()) { // decode const char* cstr=params.as_string(0, "parameter must be string").cstr(); - char* decoded_cstr=0; + void* decoded_cstr=0; size_t decoded_size=0; pa_base64_decode(cstr, strlen(cstr), decoded_cstr, decoded_size); if(decoded_cstr && decoded_size) - r.write_assign_lang(*new String(decoded_cstr, decoded_size, true)); + r.write_assign_lang(*new String(static_cast(decoded_cstr), decoded_size, true)); } else { // encode - VString& self=GET_SELF(r, VString); - const char* cstr=self.string().cstr(); + VString& vself=GET_SELF(r, VString); + const char* cstr=vself.string().cstr(); const char* encoded=pa_base64_encode(cstr, strlen(cstr)); r.write_assign_lang(*new String(encoded, 0, true/*once ?param=base64(something) was needed*/)); }