Fix: gcc 9 -Warray-bounds warnings about memset() in generated code

protocolbuffers · Sep 29, 2020 · d16bf91 · d16bf91
1 parent 3d8943f
commit d16bf91
Show file tree

Hide file tree

Showing 7 changed files with 69 additions and 46 deletions.
diff --git a/src/google/protobuf/api.pb.cc b/src/google/protobuf/api.pb.cc
diff --git a/src/google/protobuf/compiler/cpp/cpp_message.cc b/src/google/protobuf/compiler/cpp/cpp_message.cc
@@ -2487,8 +2487,9 @@ void MessageGenerator::GenerateConstructorBody(io::Printer* printer,
         "  reinterpret_cast<char*>(&$first$_)) + sizeof($last$_));\n";
   } else {
     pod_template =
-        "::memset(&$first$_, 0, static_cast<size_t>(\n"
-        "    reinterpret_cast<char*>(&$last$_) -\n"
+        "::memset(reinterpret_cast<char*>(this) + static_cast<size_t>(\n"
+        "    reinterpret_cast<char*>(&$first$_) - reinterpret_cast<char*>(this)),\n"
+        "    0, static_cast<size_t>(reinterpret_cast<char*>(&$last$_) -\n"
         "    reinterpret_cast<char*>(&$first$_)) + sizeof($last$_));\n";
   }
 

diff --git a/src/google/protobuf/compiler/plugin.pb.cc b/src/google/protobuf/compiler/plugin.pb.cc
diff --git a/src/google/protobuf/descriptor.pb.cc b/src/google/protobuf/descriptor.pb.cc
diff --git a/src/google/protobuf/duration.pb.cc b/src/google/protobuf/duration.pb.cc
diff --git a/src/google/protobuf/timestamp.pb.cc b/src/google/protobuf/timestamp.pb.cc
diff --git a/src/google/protobuf/type.pb.cc b/src/google/protobuf/type.pb.cc