--- parser3/src/main/pa_charsets.C	2017/02/07 22:00:41	1.24
+++ parser3/src/main/pa_charsets.C	2025/05/26 00:52:15	1.29
@@ -1,13 +1,13 @@
 /** @file
 	Parser: sql driver manager implementation.
 
-	Copyright (c) 2001-2017 Art. Lebedev Studio (http://www.artlebedev.com)
-	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
+	Copyright (c) 2001-2024 Art. Lebedev Studio (http://www.artlebedev.com)
+	Authors: Konstantin Morshnev <moko@design.ru>, Alexandr Petrosian <paf@design.ru>
 */
 
 #include "pa_charsets.h"
 
-volatile const char * IDENT_PA_CHARSETS_C="$Id: pa_charsets.C,v 1.24 2017/02/07 22:00:41 moko Exp $" IDENT_PA_CHARSETS_H;
+volatile const char * IDENT_PA_CHARSETS_C="$Id: pa_charsets.C,v 1.29 2025/05/26 00:52:15 moko Exp $" IDENT_PA_CHARSETS_H;
 
 // defines for globals
 
@@ -15,7 +15,8 @@ volatile const char * IDENT_PA_CHARSETS_
 
 // globals
 
-Charset pa_UTF8_charset(0, *new String(CHARSET_UTF8_NAME), 0/*no file=system*/);
+static String charset_utf8_name(CHARSET_UTF8_NAME);
+Charset pa_UTF8_charset(0, charset_utf8_name, 0/*no file=system*/);
 
 Charsets pa_charsets;
 
@@ -26,7 +27,7 @@ Charsets::Charsets() {
 }
 
 Charset& Charsets::get(String::Body ANAME) {
-	ANAME=str_upper(ANAME.cstr(), ANAME.length());
+	ANAME=String::Body(str_upper(ANAME.cstr(), ANAME.length()));
 	if(Charset* result=HashString<value_type>::get(ANAME))
 		return *result;
 	else
@@ -51,7 +52,7 @@ Charset* Charsets::checkBOM(char *&body,
 }
 
 void Charsets::load_charset(Request_charsets& charsets, String::Body ANAME, const String& afile_spec) {
-	ANAME=str_upper(ANAME.cstr(), ANAME.length());
+	ANAME=String::Body(str_upper(ANAME.cstr(), ANAME.length()));
 	//we know that charset?
 	if(HashString<value_type>::get(ANAME))
 		return; // don't load it then