Merge pull request #6828 from ObsidianMinor/csharp/get-string-overload

Use 3 parameter Encoding.GetString for default string values

Merge pull request #6828 from ObsidianMinor/csharp/get-string-overload
Use 3 parameter Encoding.GetString for default string values
d052a055 · Jan Tattermusch · GitHub · 4668a332 · e119a432 · d052a055
Unverified Commit d052a055 authored Nov 05, 2019 by Jan Tattermusch Committed by GitHub Nov 05, 2019
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

Unittest.cs csharp/src/Google.Protobuf.Test/TestProtos/Unittest.cs +0 -0

csharp_field_base.cc src/google/protobuf/compiler/csharp/csharp_field_base.cc +1 -1

No files found.
--- a/csharp/src/Google.Protobuf.Test/TestProtos/Unittest.cs
+++ b/csharp/src/Google.Protobuf.Test/TestProtos/Unittest.cs
--- a/src/google/protobuf/compiler/csharp/csharp_field_base.cc
+++ b/src/google/protobuf/compiler/csharp/csharp_field_base.cc
@@ -308,7 +308,7 @@ std::string FieldGeneratorBase::GetStringDefaultValueInternal(const FieldDescrip
    else
      return "global::System.Text.Encoding.UTF8.GetString(global::System."
             "Convert.FromBase64String(\"" +
-             StringToBase64(descriptor->default_value_string()) + "\"))";
+             StringToBase64(descriptor->default_value_string()) + "\"), 0, " + StrCat(descriptor->default_value_string().length()) + ")";
 }

 std::string FieldGeneratorBase::GetBytesDefaultValueInternal(const FieldDescriptor* descriptor) {