1 files changed, 3 insertions, 0 deletions
diff --git a/src/lib/util/encode/base_n.cc b/src/lib/util/encode/base_n.cc
index e79f11d11f..46cb02c92b 100644
--- a/src/lib/util/encode/base_n.cc
+++ b/src/lib/util/encode/base_n.cc
@@ -123,6 +123,9 @@ public:
         if (in_pad_) {
             return (BINARY_ZERO_CODE);
         } else {
+            if (base_ == base_end_) {
+                isc_throw(BadValue, "end of input");
+            }
             return (*base_);
         }
     }