--- parser3/src/classes/json.C 2025/05/26 00:52:15 1.67 +++ parser3/src/classes/json.C 2026/10/25 18:28:39 1.72 @@ -1,7 +1,7 @@ /** @file Parser: @b json parser class. - Copyright (c) 2000-2024 Art. Lebedev Studio (http://www.artlebedev.com) + Copyright (c) 2000-2026 Art. Lebedev Studio (https://www.artlebedev.com) Authors: Konstantin Morshnev */ @@ -20,7 +20,7 @@ #include "pa_vxdoc.h" #endif -volatile const char * IDENT_JSON_C="$Id: json.C,v 1.67 2025/05/26 00:52:15 moko Exp $"; +volatile const char * IDENT_JSON_C="$Id: json.C,v 1.72 2026/10/25 18:28:39 moko Exp $"; // class @@ -36,7 +36,7 @@ public: DECLARE_CLASS_VAR(json, new MJson); -bool handle_array_default=true; +THREAD_LOCAL bool handle_array_default=true; // thread local: can be changed anytime // methods struct Json : public PA_Allocated { @@ -103,6 +103,12 @@ const VJunction* MJson::put_element(cons } +static String numbered_key(const String& key, uint number){ + String result; + result << key << "_" << pa_uitoa(number); + return result; +} + static void set_json_value(Json *json, Value *value){ VHashBase *top = json->stack.top_value(); if(json->key == NULL){ @@ -121,11 +127,18 @@ static void set_json_value(Json *json, V break; case Json::D_ALL: if (top->hash().put_dont_replace(*json->key, value)){ - for(int i=2;;i++){ - String key; - key << *json->key << "_" << pa_uitoa(i); - if (!top->hash().put_dont_replace(key, value)) break; + // linear counting every time takes quadratic time, thus binary search; one of 2..count+1 is free for sure + uint lo=2, hi=top->hash().count()+1; + while(lohash().get(numbered_key(*json->key, mid))) + lo=mid+1; + else + hi=mid; } + // the found number is free, unless the numbered keys have gaps + for(uint i=lo;;i++) + if (!top->hash().put_dont_replace(numbered_key(*json->key, i), value)) break; } break; } @@ -133,11 +146,15 @@ static void set_json_value(Json *json, V } } -String* json_string(Json *json, const char *value, uint32_t length){ - String::C result = json->charset !=NULL ? - Charset::transcode(String::C(value, length), pa_UTF8_charset, *json->charset) : - String::C(pa_strdup(value, length), length); - return new String(result, json->taint); +String* json_string(Json *json, const char *value){ + /* do_callback_withbuf guarantees a null-terminated value */ + if (size_t length = strlen(value)){ + String::C result = json->charset !=NULL ? + Charset::transcode(String::C(value, length), pa_UTF8_charset, *json->charset) : + String::C(pa_strdup(value, length), length); + return new String(result, json->taint); + } + return (String*)&String::Empty; } static Value *json_hook(Request &r, Junction *hook, String* key, Value* value){ @@ -149,7 +166,7 @@ static Value *json_hook(Request &r, Junc }); } -static int json_callback(Json *json, int type, const char *value, uint32_t length) +static int json_callback(Json *json, int type, const char *value, uint32_t) { switch(type) { case JSON_OBJECT_BEGIN:{ @@ -204,23 +221,23 @@ static int json_callback(Json *json, int } break; case JSON_KEY: - json->key = json_string(json, value, length); + json->key = json_string(json, value); break; case JSON_INT: if (json->handle_int){ - set_json_value(json, new VDouble( json_string(json, value, length)->as_double() )); + set_json_value(json, new VDouble( json_string(json, value)->as_double() )); } else { // JSON_STRING - set_json_value(json, new VString(*json_string(json, value, length))); + set_json_value(json, new VString(*json_string(json, value))); } break; case JSON_FLOAT: if (json->handle_double){ - set_json_value(json, new VDouble( json_string(json, value, length)->as_double() )); + set_json_value(json, new VDouble( json_string(json, value)->as_double() )); break; } // else is JSON_STRING case JSON_STRING: - set_json_value(json, new VString(*json_string(json, value, length))); + set_json_value(json, new VString(*json_string(json, value))); break; case JSON_NULL: set_json_value(json, VVoid::get()); @@ -254,8 +271,6 @@ static const char* json_error_message(in return error_messages[error_code]; } -extern String::Language get_untaint_lang(const String& lang_name); - #define SOURCE_MAX_LEN 60 void json_exception_with_source(Request& r, const char* msg, const char* json, int offset){ @@ -337,7 +352,8 @@ static void _parse(Request& r, MethodPar if(HashStringValue* options=params.as_hash(1)) { int valid_options=0; if(Value* value=options->get("depth")) { - config.max_nesting=r.process(*value).as_int(); + int depth=r.process(*value).as_int(); + config.max_nesting=depth>0 ? depth : 0; // 0 is no limit, negative is the same valid_options++; } if(Value* value=options->get("double")) { @@ -355,7 +371,7 @@ static void _parse(Request& r, MethodPar valid_options++; } if(Value* value=options->get("taint")) { - json.taint=get_untaint_lang(value->as_string()); + json.taint=String::name2lang(value->as_string()); valid_options++; } if(Value* value=options->get("object")) { @@ -454,7 +470,7 @@ class Json_string_recursion { Json_options& foptions; public: Json_string_recursion(Json_options& aoptions) : foptions(aoptions) { - if(++foptions.json_string_recursion==ANTI_ENDLESS_JSON_STRING_RECURSION) + if(++foptions.json_string_recursion>=ANTI_ENDLESS_JSON_STRING_RECURSION) throw Exception(PARSER_RUNTIME, 0, "call canceled - endless json recursion detected"); } ~Json_string_recursion() { @@ -621,65 +637,52 @@ static void _string(Request& r, MethodPa if(HashStringValue* options=params.as_hash(1)) { json.params=¶ms[1]; HashStringValue* methods=new HashStringValue(); - int valid_options=0; HashStringValue* vvalue; for(HashStringValue::Iterator i(*options); i; i.next() ){ String::Body key=i.key(); Value* value=i.value(); if(key == "skip-unknown"){ json.skip_unknown=r.process(*value).as_bool(); - valid_options++; } else if(key == "one-line"){ json.one_line=r.process(*value).as_bool(); - valid_options++; } else if(key == "date" && value->is_string()){ const String& svalue=value->as_string(); if(!json.set_date_format(svalue)) throw Exception(PARSER_RUNTIME, &svalue, "must be 'sql-string', 'gmt-string', 'iso-string' or 'unix-timestamp'"); - valid_options++; } else if(key == "indent"){ if(value->is_string()){ json.indent=value->as_string().cstr(); json.json_string_recursion=strlen(json.indent); } else json.indent=r.process(*value).as_bool() ? "" : NULL; - valid_options++; } else if(key == "table" && value->is_string()){ const String& svalue=value->as_string(); if(!json.set_table_format(svalue)) throw Exception(PARSER_RUNTIME, &svalue, "must be 'array', 'object' or 'compact'"); - valid_options++; } else if(key == "array" && value->is_string()){ const String& svalue=value->as_string(); if(!json.set_array_format(svalue)) throw Exception(PARSER_RUNTIME, &svalue, "must be 'array', 'object' or 'compact'"); - valid_options++; } else if(key == "file" && value->is_string()){ const String& svalue=value->as_string(); if(!json.set_file_format(svalue)) throw Exception(PARSER_RUNTIME, &svalue, "must be 'base64', 'text' or 'stat'"); - valid_options++; } else if(key == "void" && value->is_string()){ const String& svalue=value->as_string(); if(!json.set_void_format(svalue)) throw Exception(PARSER_RUNTIME, &svalue, "must be 'string' or 'null'"); - valid_options++; #ifdef XML } else if(key == "xdoc" && (vvalue = value->get_hash())){ json.xdoc_options=new XDocOutputOptions(); json.xdoc_options->append(r, vvalue); - valid_options++; #endif } else if(Junction* junction=value->get_junction()){ if(!junction->method || !junction->method->params_names || junction->method->params_count != 3) throw Exception(PARSER_RUNTIME, 0, "$.%s must be parser method with 3 parameters", key.cstr()); methods->put(key, value); - valid_options++; - } + } else + throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION); } - if(valid_options!=options->count()) - throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION); - // special handling for $._default if(VHashBase* vhash=dynamic_cast(¶ms[1])) if(Value* value=vhash->get_default()) {