From d0e311e283918a248013dd35ee76970e16340d71 Mon Sep 17 00:00:00 2001 From: Simone Margaritelli Date: Thu, 26 Sep 2019 14:30:01 +0200 Subject: [PATCH 1/2] Releasing v2.25 --- core/banner.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/banner.go b/core/banner.go index 71731b31..6deba5c7 100644 --- a/core/banner.go +++ b/core/banner.go @@ -2,7 +2,7 @@ package core const ( Name = "bettercap" - Version = "2.24.1" + Version = "2.25" Author = "Simone 'evilsocket' Margaritelli" Website = "https://bettercap.org/" ) From 74ada7e86556cb38576c2bce2fbd58c0a4083c60 Mon Sep 17 00:00:00 2001 From: Nikita Safonov Date: Thu, 26 Sep 2019 16:52:31 +0300 Subject: [PATCH 2/2] lock meta mutex during marshaling --- network/meta.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/network/meta.go b/network/meta.go index 48ab2f9f..ecb75c43 100644 --- a/network/meta.go +++ b/network/meta.go @@ -29,6 +29,8 @@ func NewMeta() *Meta { } func (m *Meta) MarshalJSON() ([]byte, error) { + m.Lock() + defer m.Unlock() return json.Marshal(metaJSON{Values: m.m}) }