--- parser3/src/main/pa_string.C	2016/12/28 17:41:15	1.258
+++ parser3/src/main/pa_string.C	2020/10/14 16:51:46	1.264
@@ -1,7 +1,7 @@
 /** @file
 	Parser: string class. @see untalength_t.C.
 
-	Copyright (c) 2001-2015 Art. Lebedev Studio (http://www.artlebedev.com)
+	Copyright (c) 2001-2017 Art. Lebedev Studio (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
@@ -12,14 +12,13 @@
 #include "pa_charset.h"
 #include "pa_vregex.h"
 
-#ifndef ULLONG_MAX
-#define ULLONG_MAX 18446744073709551615ULL
-#endif
-
-volatile const char * IDENT_PA_STRING_C="$Id: pa_string.C,v 1.258 2016/12/28 17:41:15 moko Exp $" IDENT_PA_STRING_H;
+volatile const char * IDENT_PA_STRING_C="$Id: pa_string.C,v 1.264 2020/10/14 16:51:46 moko Exp $" IDENT_PA_STRING_H;
 
 const String String::Empty;
 
+#define COMPILE_ASSERT(x) extern int assert_checker[(x) ? 1 : -1]
+COMPILE_ASSERT(sizeof(String::Languages) == sizeof(CORD));
+
 // pa_atoui is based on Manuel Novoa III _strto_l for uClibc
 
 template<typename T> inline T pa_ato_any(const char *str, int base, const String* problem_source,const T max){
@@ -87,14 +86,20 @@ template<typename T> inline T pa_ato_any
 }
 
 unsigned int pa_atoui(const char *str, int base, const String* problem_source){
+	if(!str)
+		return 0;
+
 	return pa_ato_any<unsigned int>(str, base, problem_source, UINT_MAX);
 }
 
 unsigned long long pa_atoul(const char *str, int base, const String* problem_source){
+	if(!str)
+		return 0;
+
 	return pa_ato_any<unsigned long long int>(str, base, problem_source, ULLONG_MAX);
 }
 
-int pa_atoi(const char* str, const String* problem_source) {
+int pa_atoi(const char* str, int base, const String* problem_source) {
 	if(!str)
 		return 0;
 
@@ -112,7 +117,7 @@ int pa_atoi(const char* str, const Strin
 		str++;
 	}
 
-	unsigned int result=pa_atoui(str, 0, problem_source);
+	unsigned int result=pa_atoui(str, base, problem_source);
 
 	if(negative && result <= ((unsigned int)(-(1+INT_MIN)))+1)
 		return -(int)result;