Update to version 3.1.6vendor/bc/3.1.6

2 files changed, 5 insertions, 4 deletions

diff --git a/src/data.c b/src/data.c
index 2556f795eed6..039c83e1cac1 100644
--- a/src/data.c
+++ b/src/data.c
@@ -141,8 +141,8 @@ const char* const bc_err_msgs[] = {
 	"empty expression",
 	"bad print statement",
 	"bad function definition",
-	"bad assignment: left side must be scale, ibase, "
-		"obase, seed, last, var, or array element",
+	("bad assignment: left side must be scale, ibase, "
+		"obase, seed, last, var, or array element"),
 	"no auto variable found",
 	"function parameter or auto \"%s%s\" already exists",
 	"block end cannot be found",
diff --git a/src/num.c b/src/num.c
index 05b4654f21f5..de5fa5c566fb 100644
--- a/src/num.c
+++ b/src/num.c
@@ -1457,7 +1457,8 @@ static void bc_num_parseDecimal(BcNum *restrict n, const char *restrict val) {
 
 	for (i = 0; i < len && (zero = (val[i] == '0' || val[i] == '.')); ++i);
 
-	n->scale = (size_t) (rdx * ((val + len) - (ptr + 1)));
+	n->scale = (size_t) (rdx * (((uintptr_t) (val + len)) -
+	                            (((uintptr_t) ptr) + 1)));
 	n->rdx = BC_NUM_RDX(n->scale);
 
 	i = len - (ptr == val ? 0 : i) - rdx;
@@ -1656,7 +1657,7 @@ static void bc_num_printDecimal(const BcNum *restrict n) {
 		memset(buffer, 0, BC_BASE_DIGS * sizeof(size_t));
 
 		for (j = 0; n9 && j < BC_BASE_DIGS; ++j) {
-			buffer[j] = n9 % BC_BASE;
+			buffer[j] = ((size_t) n9) % BC_BASE;
 			n9 /= BC_BASE;
 		}