quic: fixup segfault in StatsBase

PR-URL: #320 Reviewed-By: Anna Henningsen <anna@addaleax.net>
nodejs · Feb 4, 2020 · 6951e2d · 6951e2d
1 parent 7ba53ab
commit 6951e2d
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 10 deletions.
diff --git a/src/quic/node_quic_session.cc b/src/quic/node_quic_session.cc
@@ -1372,6 +1372,8 @@ QuicSession::~QuicSession() {
   listener_->OnSessionDestroyed();
   if (listener_ == listener())
     RemoveListener(listener_);
+
+  DebugStats();
 }
 
 template <typename Fn>

diff --git a/src/quic/node_quic_session.h b/src/quic/node_quic_session.h
@@ -242,7 +242,7 @@ struct QuicSessionStatsTraits {
   using Base = QuicSession;
 
   template <typename Fn>
-  static void ToString(const QuicSession& ptr, Fn&& add_field);
+  static void ToString(const Base& ptr, Fn&& add_field);
 };
 
 class QuicSessionListener {

diff --git a/src/quic/node_quic_socket.cc b/src/quic/node_quic_socket.cc
@@ -290,6 +290,8 @@ QuicSocket::~QuicSocket() {
   listener_->OnDestroy();
   if (listener == listener_)
     RemoveListener(listener_);
+
+  DebugStats();
 }
 
 template <typename Fn>

diff --git a/src/quic/node_quic_socket.h b/src/quic/node_quic_socket.h
@@ -75,7 +75,7 @@ struct QuicSocketStatsTraits {
   using Base = QuicSocket;
 
   template <typename Fn>
-  static void ToString(const QuicSocket& ptr, Fn&& add_field);
+  static void ToString(const Base& ptr, Fn&& add_field);
 };
 
 class QuicSocket;

diff --git a/src/quic/node_quic_stream.cc b/src/quic/node_quic_stream.cc
@@ -55,7 +55,9 @@ QuicStream::QuicStream(
   IncrementStat(&QuicStreamStats::max_offset, params.initial_max_data);
 }
 
-QuicStream::~QuicStream() {}
+QuicStream::~QuicStream() {
+  DebugStats();
+}
 
 template <typename Fn>
 void QuicStreamStatsTraits::ToString(const QuicStream& ptr, Fn&& add_field) {

diff --git a/src/quic/node_quic_stream.h b/src/quic/node_quic_stream.h
@@ -71,7 +71,7 @@ struct QuicStreamStatsTraits {
   using Base = QuicStream;
 
   template <typename Fn>
-  static void ToString(const QuicStream& ptr, Fn&& add_field);
+  static void ToString(const Base& ptr, Fn&& add_field);
 };
 
 // QuicHeader is a base class for implementing QUIC application

diff --git a/src/quic/node_quic_util-inl.h b/src/quic/node_quic_util-inl.h
@@ -425,11 +425,9 @@ void StatsBase<T>::StatsMemoryInfo(MemoryTracker* tracker) const {
 }
 
 template <typename T>
-StatsBase<T>::~StatsBase() {
-  StatsBase<T>::StatsDebug stats_debug(static_cast<typename T::Base*>(this));
-  Debug(static_cast<typename T::Base*>(this),
-        "Destroyed. %s",
-        stats_debug.ToString().c_str());
+void StatsBase<T>::DebugStats() {
+  StatsDebug stats_debug(static_cast<T::Base*>(this));
+  Debug(static_cast<T::Base*>(this), "Destroyed. %s", stats_debug);
 }
 
 template <typename T>

diff --git a/src/quic/node_quic_util.h b/src/quic/node_quic_util.h
@@ -105,7 +105,7 @@ class StatsBase {
       v8::Local<v8::Object> wrap,
       int options = HistogramOptions::NONE);
 
-  inline ~StatsBase();
+  inline ~StatsBase() = default;
 
   // The StatsDebug utility is used when StatsBase is destroyed
   // to output statistical information.
@@ -142,6 +142,8 @@ class StatsBase {
 
   inline void StatsMemoryInfo(MemoryTracker* tracker) const;
 
+  inline void DebugStats();
+
  private:
   typename T::Stats stats_{};
   BaseObjectPtr<HistogramBase> rate_;