From 82a057596ec46cf6deb4a81b1cd6a84a2f67ac1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20P=C3=A4rtel?= <martin.partel@gmail.com>
Date: Wed, 12 Feb 2020 08:47:24 +0200
Subject: [PATCH] Destruct CodedOutputStream instead of using Trim()

---
 .../compiler/command_line_interface.cc        | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/google/protobuf/compiler/command_line_interface.cc b/src/google/protobuf/compiler/command_line_interface.cc
index 093284e819..060c2f6566 100644
--- a/src/google/protobuf/compiler/command_line_interface.cc
+++ b/src/google/protobuf/compiler/command_line_interface.cc
@@ -2229,17 +2229,19 @@ bool CommandLineInterface::WriteDescriptorSet(
 
   io::FileOutputStream out(fd);
 
-  io::CodedOutputStream coded_out(&out);
-  // Determinism is useful here because build outputs are sometimes checked
-  // into version control.
-  coded_out.SetSerializationDeterministic(true);
-  if (!file_set.SerializeToCodedStream(&coded_out)) {
-    std::cerr << descriptor_set_out_name_ << ": " << strerror(out.GetErrno())
-              << std::endl;
-    out.Close();
-    return false;
+  {
+    io::CodedOutputStream coded_out(&out);
+    // Determinism is useful here because build outputs are sometimes checked
+    // into version control.
+    coded_out.SetSerializationDeterministic(true);
+    if (!file_set.SerializeToCodedStream(&coded_out)) {
+      std::cerr << descriptor_set_out_name_ << ": " << strerror(out.GetErrno())
+                << std::endl;
+      out.Close();
+      return false;
+    }
   }
-  coded_out.Trim();
+
   if (!out.Close()) {
     std::cerr << descriptor_set_out_name_ << ": " << strerror(out.GetErrno())
               << std::endl;