From bc727175821e2f3f83399b849671fb91f4719e30 Mon Sep 17 00:00:00 2001 From: 9seconds Date: Tue, 24 Mar 2020 16:36:03 +0300 Subject: [PATCH] Fix a bug with crashing desktop telegram --- wrappers/packetack/pools.go | 14 -------------- wrappers/packetack/proxy.go | 5 ++--- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/wrappers/packetack/pools.go b/wrappers/packetack/pools.go index 7cd7fd5..30a0d7d 100644 --- a/wrappers/packetack/pools.go +++ b/wrappers/packetack/pools.go @@ -11,27 +11,13 @@ var ( return &bytes.Buffer{} }, } - poolProxyBytesBuffer = sync.Pool{ - New: func() interface{} { - return &bytes.Buffer{} - }, - } ) func acquireClientBytesBuffer() *bytes.Buffer { return poolClientBytesBuffer.Get().(*bytes.Buffer) } -func acquireProxyBytesBuffer() *bytes.Buffer { - return poolProxyBytesBuffer.Get().(*bytes.Buffer) -} - func releaseClientBytesBuffer(buf *bytes.Buffer) { buf.Reset() poolClientBytesBuffer.Put(buf) } - -func releaseProxyBytesBuffer(buf *bytes.Buffer) { - buf.Reset() - poolProxyBytesBuffer.Put(buf) -} diff --git a/wrappers/packetack/proxy.go b/wrappers/packetack/proxy.go index 25ae6cb..8e18631 100644 --- a/wrappers/packetack/proxy.go +++ b/wrappers/packetack/proxy.go @@ -22,10 +22,9 @@ type wrapperProxy struct { } func (w *wrapperProxy) Write(packet conntypes.Packet, acks *conntypes.ConnectionAcks) error { - buf := acquireProxyBytesBuffer() - defer releaseProxyBytesBuffer(buf) - + buf := bytes.Buffer{} flags := w.flags + if acks.Quick { flags |= rpc.ProxyRequestFlagsQuickAck }