--- parser3/src/classes/json.C	2015/09/18 00:43:47	1.38
+++ parser3/src/classes/json.C	2016/03/31 21:46:20	1.41
@@ -1,7 +1,7 @@
 /** @file
 	Parser: @b json parser class.
 
-	Copyright (c) 2000-2012 Art. Lebedev Studio (http://www.artlebedev.com)
+	Copyright (c) 2000-2015 Art. Lebedev Studio (http://www.artlebedev.com)
 */
 
 #include "classes.h"
@@ -18,7 +18,7 @@
 #include "pa_vxdoc.h"
 #endif
 
-volatile const char * IDENT_JSON_C="$Id: json.C,v 1.38 2015/09/18 00:43:47 moko Exp $";
+volatile const char * IDENT_JSON_C="$Id: json.C,v 1.41 2016/03/31 21:46:20 moko Exp $";
 
 // class
 
@@ -29,7 +29,7 @@ public:
 
 // global variable
 
-DECLARE_CLASS_VAR(json, new MJson, 0);
+DECLARE_CLASS_VAR(json, new MJson);
 
 // methods
 struct Json {
@@ -97,7 +97,7 @@ String* json_string(Json *json, const ch
 	String::C result = json->charset !=NULL ? 
 		Charset::transcode(String::C(value, length), UTF8_charset, *json->charset) :
 		String::C(pa_strdup(value, length), length);
-	return new String(result.str, json->taint, result.length);
+	return new String(result, json->taint);
 }
 
 static Value *json_hook(Request &r, Junction *hook, String* key, Value* value){