--- parser3/src/classes/json.C 2026/04/25 13:38:46 1.70 +++ parser3/src/classes/json.C 2026/10/25 18:28:39 1.72 @@ -20,7 +20,7 @@ #include "pa_vxdoc.h" #endif -volatile const char * IDENT_JSON_C="$Id: json.C,v 1.70 2026/04/25 13:38:46 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; } @@ -258,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){ @@ -341,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")) { @@ -359,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")) { @@ -458,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() {