lib: base64 - Fix dest buffer assertion in base64_decode_more().

The assertion is supposed to trigger when the encoder hits the buffer size limit
unexpectedly (src_pos_r==NULL means that all should be encoded at once). It
triggered erroneously when the destination buffer had the exact size needed
for the encoded data.

diff --git a/src/lib/base64.c b/src/lib/base64.c
index 60ceb132f95c71d1f95f97cf962823953cdb52dd..fb6cd635e62d265d8fd5c0aebbbff1232f7f4474 100644 (file)
--- a/src/lib/base64.c
+++ b/src/lib/base64.c
@@ -591,8 +591,10 @@ int base64_decode_more(struct base64_decoder *dec,
                        i_unreached();
                }
                if (dst_avail == 0) {
-                       i_assert(src_pos_r != NULL);
-                       *src_pos_r = src_pos + 1;
+                       if (src_pos_r != NULL)
+                               *src_pos_r = src_pos + 1;
+                       else
+                               i_assert(src_pos + 1 == src_size);
                        return 1;
                }
        }