ext/sodium: Correct base64 decoding with unpadded variants

jedisct1 · jedisct1 · commit 542d0bce50b3 · 2018-11-24T17:53:08.000+01:00
Backports 0eee0b957a3b75f8175cdd30b306c15e372685e8 from the PECL extension
diff --git a/ext/sodium/libsodium.c b/ext/sodium/libsodium.c
@@ -2780,7 +2780,7 @@ PHP_FUNCTION(sodium_base642bin)
 							 "invalid base64 variant identifier", 0);
 		return;
 	}
-	bin_len = b64_len / 4U * 3U + 1U;
+	bin_len = b64_len / 4U * 3U + 2U;
 	bin = zend_string_alloc(bin_len, 0);
 	if (sodium_base642bin((unsigned char *) ZSTR_VAL(bin), bin_len,
 						  b64, b64_len,

Original file line number	Diff line number	Diff line change
`@@ -2780,7 +2780,7 @@ PHP_FUNCTION(sodium_base642bin)`
`2780`	`2780`	`"invalid base64 variant identifier", 0);`
`2781`	`2781`	`return;`
`2782`	`2782`	`}`
`2783`		`- bin_len = b64_len / 4U * 3U + 1U;`
	`2783`	`+ bin_len = b64_len / 4U * 3U + 2U;`
`2784`	`2784`	`bin = zend_string_alloc(bin_len, 0);`
`2785`	`2785`	`if (sodium_base642bin((unsigned char *) ZSTR_VAL(bin), bin_len,`
`2786`	`2786`	`b64, b64_len,`