--- parser3/src/classes/math.C	2019/11/12 21:56:42	1.88
+++ parser3/src/classes/math.C	2021/01/13 21:28:15	1.97
@@ -1,7 +1,7 @@
 /** @file
 	Parser: @b math parser class.
 
-	Copyright (c) 2001-2017 Art. Lebedev Studio (http://www.artlebedev.com)
+	Copyright (c) 2001-2020 Art. Lebedev Studio (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru>(http://paf.design.ru)
 
 	portions from gen_uuid.c,
@@ -10,6 +10,7 @@
 
 #include "pa_vmethod_frame.h"
 #include "pa_common.h"
+#include "pa_base64.h"
 #include "pa_vint.h"
 #include "pa_vmath.h"
 #include "pa_vfile.h"
@@ -22,7 +23,7 @@
 extern "C" char *crypt(const char* , const char* );
 #endif
 
-volatile const char * IDENT_MATH_C="$Id: math.C,v 1.88 2019/11/12 21:56:42 moko Exp $";
+volatile const char * IDENT_MATH_C="$Id: math.C,v 1.97 2021/01/13 21:28:15 moko Exp $";
 
 // defines
 
@@ -473,19 +474,50 @@ static void _digest(Request& r, MethodPa
 		r.write(*new String(hex_string((unsigned char *)digest.str, digest.length, false)));
 	}
 	if(format == F_BASE64){
-		r.write(*new String(pa_base64_encode(digest.str, digest.length)));
+		r.write(*new String(pa_base64_encode(digest.str, digest.length, Base64Options(false /*no wrap*/))));
 	}
 }
 
-static void _uuid(Request& r, MethodParams& /*params*/) {
-	r.write(*new String(get_uuid_cstr()));
+static void _uuid(Request& r, MethodParams& params) {
+	bool lower=false;
+	bool solid=false;
+
+	if (params.count() == 1)
+		if (HashStringValue* options = params.as_hash(0)) {
+			int valid_options = 0;
+			if (Value* vlower = options->get("lower")) {
+				lower = r.process(*vlower).as_bool();
+				valid_options++;
+			}
+			if (Value* vsolid = options->get("solid")) {
+				solid = r.process(*vsolid).as_bool();
+				valid_options++;
+			}
+			if (valid_options != options->count())
+				throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);
+		}
+	
+	r.write(*new String(get_uuid_cstr(lower, solid)));
 }
 
-static void _uid64(Request& r, MethodParams& /*params*/) {
+static void _uid64(Request& r, MethodParams& params) {
+	bool lower = false;
+
+	if (params.count() == 1)
+		if (HashStringValue* options = params.as_hash(0)) {
+			int valid_options = 0;
+			if (Value* vlower = options->get("lower")) {
+				lower = r.process(*vlower).as_bool();
+				valid_options++;
+			}
+			if (valid_options != options->count())
+				throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);
+		}
+
 	unsigned char id[64/8];
 	random(&id, sizeof(id));
 
-	r.write(*new String(hex_string(id, sizeof(id), true)));
+	r.write(*new String(hex_string(id, sizeof(id), !lower)));
 }
 
 static void _crc32(Request& r, MethodParams& params) {
@@ -493,9 +525,9 @@ static void _crc32(Request& r, MethodPar
 	r.write(*new VInt(pa_crc32(string, strlen(string))));
 }
 
-static const char* abc_hex="0123456789ABCDEF";
+static const char* abc_hex = "0123456789ABCDEF";
 
-static unsigned char hex_lookup[256]={
+static unsigned char hex_lookup[256] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -505,11 +537,12 @@ static unsigned char hex_lookup[256]={
 	 0,10,11,12,13,14,15, 0, 0, 0, 0, 0, 0, 0, 0, 0
 };
 
-static unsigned char abc_lookup[256]={};
-static unsigned char abc_256_lookup[256]={};
+static unsigned char abc_lookup[256] = {};
+static unsigned char abc_256_lookup[256] = {};
 
-inline unsigned char *init_abc_256(){
-	if(!abc_256_lookup[255]) for(int i=0; i<256; i++) abc_256_lookup[i] = (unsigned char)i;
+inline unsigned char *init_abc_256() {
+	if(!abc_256_lookup[255])
+		for(int i=0; i<256; i++) abc_256_lookup[i] = (unsigned char)i;
 	return abc_256_lookup;
 }
 
@@ -521,7 +554,7 @@ static void _convert(Request& r, MethodP
 	const char *abc_from;
 	int base_from;
 
-	if(params[1].is_string()){
+	if(params[1].is_string()) {
 		abc_from = params[1].get_string()->cstr();
 		base_from = strlen(abc_from);
 		if(base_from < 2)
@@ -533,7 +566,7 @@ static void _convert(Request& r, MethodP
 		base_from=params.as_int(1, "base 'from' must be integer or string", r);
 		if(base_from < 2 || base_from > 16 && base_from != 256)
 			throw Exception(PARSER_RUNTIME, 0, "base 'from' must be an integer from 2 to 16 or 256");
-		if (base_from == 256){
+		if (base_from == 256) {
 			abc_from = "";
 			lookup = init_abc_256();
 		} else {
@@ -546,7 +579,7 @@ static void _convert(Request& r, MethodP
 	const char *abc_to;
 	int base_to;
 
-	if(params[2].is_string()){
+	if(params[2].is_string()) {
 		abc_to=params[2].get_string()->cstr();
 		base_to=strlen(abc_to);
 		if(base_to < 2)
@@ -555,7 +588,7 @@ static void _convert(Request& r, MethodP
 		base_to=params.as_int(2, "base 'to' must be integer or string", r);
 		if(base_to < 2 || base_to > 16 && base_to != 256)
 			throw Exception(PARSER_RUNTIME, 0, "base 'to' must be an integer from 2 to 16 or 256");
-		if (base_to == 256){
+		if (base_to == 256) {
 			abc_to = (char *)init_abc_256();
 		} else {
 			abc_to = abc_hex;
@@ -589,7 +622,7 @@ static void _convert(Request& r, MethodP
 
 	if(abc_mode){
 
-		for(c=src;c<src_end;c++){
+		for(c=src;c<src_end;c++) {
 			unsigned char digit=lookup[*c];
 			if(!digit && *c != abc_from[0])
 				throw Exception("number.format", 0, "'%c' is invalid digit", *c);
@@ -625,7 +658,7 @@ static void _convert(Request& r, MethodP
 
 	}
 
-	if(src==src_end){
+	if(src==src_end) {
 		if(sign)
 			throw Exception("number.format", 0,  "'%c' is invalid number", negative ? '-' : '+');
 		if(result_file)
@@ -633,9 +666,9 @@ static void _convert(Request& r, MethodP
 		return;
 	}
 
-	// core
+	// core, using log since log2 is not present in FreeBSD < 8.X
 
-	Array<char> remainders(round(data.length * log2(base_from) / log2(base_to)) + 1);
+	Array<char> remainders((size_t)round(data.length * log((double)base_from) / log((double)base_to)) + 1);
 
 	do {
 		int carry = 0;
@@ -643,7 +676,7 @@ static void _convert(Request& r, MethodP
 		for (c=src; c<src_end; c++) {
 			carry = carry * base_from + *c;
 			if (carry >= base_to) {
-				*(dst++) = carry / base_to;
+				*(dst++) = (unsigned char)(carry / base_to);
 				carry %= base_to;
 			} else if (dst > src) {
 				*(dst++) = 0;
@@ -659,15 +692,21 @@ static void _convert(Request& r, MethodP
 	char *result_str = (char *)pa_malloc_atomic(result_length+1);
 	if(negative)
 		result_str[0] = '-';
-	for(int i=0; i<remainders.count(); i++)
+	for(size_t i=0; i<remainders.count(); i++)
 		result_str[result_length - 1 - i] = remainders[i];
 	result_str[result_length]='\0';
 
-	if(result_file){
+	if(result_file) {
 		result_file->set(true /*tainted*/, 0 /*binary*/, result_str, result_length, 0, 0, &r);
 		r.write(*result_file);
 	} else {
-		r.write(*new String(result_str, String::L_TAINTED)); // note: there can be '\0' inside
+		if(memchr(result_str, 0, result_length))
+			throw Exception(PARSER_RUNTIME, 0, "Invalid \\x00 character found while converting to string. Convert to file instead.");
+
+		fix_line_breaks(result_str, result_length);
+
+		if(result_length)
+			r.write(*new String(result_str, String::L_TAINTED));
 	}
 }
 
@@ -712,10 +751,12 @@ MMath::MMath(): Methoded("math") {
 	ADD1(crc32);
 
 	// ^math:uuid[]
-	ADD0(uuid);
+	// ^math:uuid[options hash]
+	add_native_method("uuid", Method::CT_STATIC, _uuid, 0, 1);
 
 	// ^math:uid64[]
-	ADD0(uid64);
+	// ^math:uid64[options hash]
+	add_native_method("uid64", Method::CT_STATIC, _uid64, 0, 1);
 
 	// ^math:convert[number|file](base-from)|[abc_from](base-to)|[abc_to][options]
 	add_native_method("convert", Method::CT_STATIC, _convert, 3, 4);