From 496aee483a5ccfa9c396de84dc0cedd234930ddc Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Tue, 2 Jan 2018 15:16:13 +0200
Subject: Fix undefined behavior (ubsan) bug

---
 libbutl/base64.cxx | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'libbutl/base64.cxx')

diff --git a/libbutl/base64.cxx b/libbutl/base64.cxx
index a8f7757..bed8059 100644
--- a/libbutl/base64.cxx
+++ b/libbutl/base64.cxx
@@ -54,14 +54,16 @@ namespace butl
       if (n && n % 19 == 0)
         *o++ = '\n'; // Split into lines, like the base64 utility does.
 
-      char c (*i++);
+      auto next = [&i] () {return static_cast<unsigned char> (*i++);};
+
+      unsigned char c (next ());
       size_t i1 ((c >> 2) & 0x3F);
       size_t i2 ((c << 4) & 0x30);
 
       size_t i3 (un);
       if (i != e)
       {
-        c = *i++;
+        c = next ();
         i2 |= (c >> 4) & 0xF;
         i3 = (c << 2) & 0x3C;
       }
@@ -69,7 +71,7 @@ namespace butl
       size_t i4 (un);
       if (i != e)
       {
-        c = *i++;
+        c = next ();
         i3 |= (c >> 6) & 0x3;
         i4 = c & 0x3F;
       }
-- 
cgit v1.1