--- parser3/src/classes/math.C	2019/11/13 21:29:51	1.89
+++ parser3/src/classes/math.C	2019/11/28 14:05:08	1.95
@@ -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.89 2019/11/13 21:29:51 moko Exp $";
+volatile const char * IDENT_MATH_C="$Id: math.C,v 1.95 2019/11/28 14:05:08 moko Exp $";
 
 // defines
 
@@ -473,7 +474,7 @@ 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*/))));
 	}
 }
 
@@ -634,9 +635,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;
@@ -644,7 +645,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;
@@ -660,7 +661,7 @@ 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';
 
@@ -668,7 +669,13 @@ static void _convert(Request& r, MethodP
 		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));
 	}
 }