From d98ed080bb31fd3d46281127871b7886288686d9 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Thu, 8 Jun 2023 11:24:31 -0400 Subject: [PATCH] Fix small overestimation of base64 encoding output length. pg_base64_enc_len() and its clones overestimated the output length by up to 2 bytes, as a result of sloppy thinking about where to divide. No callers require a precise estimate, so this has no consequences worse than palloc'ing a byte or two more than necessary. We might as well get it right though. This bug is very ancient, dating to commit 79d78bb26 which added encode.c. (The other instances were presumably copied from there.) Still, it doesn't quite seem worth back-patching. Oleg Tselebrovskiy Discussion: https://postgr.es/m/f94da55286a63022150bc266afdab754@postgrespro.ru --- contrib/pgcrypto/pgp-armor.c | 2 +- src/backend/utils/adt/encode.c | 2 +- src/common/base64.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/pgcrypto/pgp-armor.c b/contrib/pgcrypto/pgp-armor.c index 679779a6ac2..9128756647c 100644 --- a/contrib/pgcrypto/pgp-armor.c +++ b/contrib/pgcrypto/pgp-armor.c @@ -165,7 +165,7 @@ pg_base64_enc_len(unsigned srclen) /* * 3 bytes will be converted to 4, linefeed after 76 chars */ - return (srclen + 2) * 4 / 3 + srclen / (76 * 3 / 4); + return (srclen + 2) / 3 * 4 + srclen / (76 * 3 / 4); } static unsigned diff --git a/src/backend/utils/adt/encode.c b/src/backend/utils/adt/encode.c index b92191de81e..e5ac3ad23df 100644 --- a/src/backend/utils/adt/encode.c +++ b/src/backend/utils/adt/encode.c @@ -385,7 +385,7 @@ static uint64 pg_base64_enc_len(const char *src, size_t srclen) { /* 3 bytes will be converted to 4, linefeed after 76 chars */ - return ((uint64) srclen + 2) * 4 / 3 + (uint64) srclen / (76 * 3 / 4); + return ((uint64) srclen + 2) / 3 * 4 + (uint64) srclen / (76 * 3 / 4); } static uint64 diff --git a/src/common/base64.c b/src/common/base64.c index 2943ac76520..ec4eb49382c 100644 --- a/src/common/base64.c +++ b/src/common/base64.c @@ -224,7 +224,7 @@ int pg_b64_enc_len(int srclen) { /* 3 bytes will be converted to 4 */ - return (srclen + 2) * 4 / 3; + return (srclen + 2) / 3 * 4; } /*