3 files changed, 13 insertions, 5 deletions
diff --git a/base/base64.cc b/base/base64.cc
index 8ed1249..9514b0a 100644
--- a/base/base64.cc
+++ b/base/base64.cc
@@ -8,15 +8,21 @@
 
 namespace base {
 
-void Base64Encode(const StringPiece& input, std::string* output) {
+bool Base64Encode(const StringPiece& input, std::string* output) {
   std::string temp;
   temp.resize(modp_b64_encode_len(input.size()));  // makes room for null byte
 
+  // null terminates result since result is base64 text!
+  int input_size = static_cast<int>(input.size());
+
   // modp_b64_encode_len() returns at least 1, so temp[0] is safe to use.
-  size_t output_size = modp_b64_encode(&(temp[0]), input.data(), input.size());
+  size_t output_size = modp_b64_encode(&(temp[0]), input.data(), input_size);
+  if (output_size == MODP_B64_ERROR)
+    return false;
 
   temp.resize(output_size);  // strips off null byte
   output->swap(temp);
+  return true;
 }
 
 bool Base64Decode(const StringPiece& input, std::string* output) {
diff --git a/base/base64.h b/base/base64.h
index 43d8f76..cc78edc 100644
--- a/base/base64.h
+++ b/base/base64.h
@@ -12,8 +12,9 @@
 
 namespace base {
 
-// Encodes the input string in base64.
-BASE_EXPORT void Base64Encode(const StringPiece& input, std::string* output);
+// Encodes the input string in base64.  Returns true if successful and false
+// otherwise.  The output string is only modified if successful.
+BASE_EXPORT bool Base64Encode(const StringPiece& input, std::string* output);
 
 // Decodes the base64 input string.  Returns true if successful and false
 // otherwise.  The output string is only modified if successful.
diff --git a/base/base64_unittest.cc b/base/base64_unittest.cc
index 9b23194..9a5dd81 100644
--- a/base/base64_unittest.cc
+++ b/base/base64_unittest.cc
@@ -16,7 +16,8 @@ TEST(Base64Test, Basic) {
   std::string decoded;
   bool ok;
 
-  Base64Encode(kText, &encoded);
+  ok = Base64Encode(kText, &encoded);
+  EXPECT_TRUE(ok);
   EXPECT_EQ(kBase64Text, encoded);
 
   ok = Base64Decode(encoded, &decoded);