From dd169d83a440bfd9c82d4008272a6de3dfde4c44 Mon Sep 17 00:00:00 2001
From: Chrystian Huot <chrystian.huot@saubeo.solutions>
Date: Fri, 25 Mar 2022 13:51:14 -0400
Subject: [PATCH] Version 6.2.1

---
 CHANGELOG.md              |  4 ++++
 COMPILING.md              | 16 ++++++++--------
 Makefile                  |  2 +-
 client/package.json       |  2 +-
 docs/platforms/darwin.md  | 12 ++++++------
 docs/platforms/freebsd.md | 12 ++++++------
 docs/platforms/linux.md   | 12 ++++++------
 docs/platforms/windows.md | 10 +++++-----
 server/parsers.go         |  2 +-
 server/unit.go            |  4 ++--
 server/version.go         |  2 +-
 11 files changed, 41 insertions(+), 37 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8dda8c9..e26f181 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@
 - Fix panic: concurrent write to websocket connection on goroutine.
 - Fix units import from SDR Trunk (issue #150).
 
+_v6.2.1_
+
+- Fix SIGSEGV error in Units.Merge (issue #151).
+
 ## Version 6.1
 
 - Calls now support patched talkgroups.
diff --git a/COMPILING.md b/COMPILING.md
index 09bfce7..5d3b3c5 100644
--- a/COMPILING.md
+++ b/COMPILING.md
@@ -26,13 +26,13 @@ Clone the official repository on your computer and start the build process.
 
 When finished, you will find the precompiled versions for various platforms in the `dist` folder.
 
-        rdio-scanner-darwin-amd64-v6.2.0.zip
-        rdio-scanner-darwin-arm64-v6.2.0.zip
-        rdio-scanner-freebsd-amd64-v6.2.0.zip
-        rdio-scanner-linux-386-v6.2.0.zip
-        rdio-scanner-linux-amd64-v6.2.0.zip
-        rdio-scanner-linux-arm64-v6.2.0.zip
-        rdio-scanner-linux-arm-v6.2.0.zip
-        rdio-scanner-windows-amd64-v6.2.0.zip
+        rdio-scanner-darwin-amd64-v6.2.1.zip
+        rdio-scanner-darwin-arm64-v6.2.1.zip
+        rdio-scanner-freebsd-amd64-v6.2.1.zip
+        rdio-scanner-linux-386-v6.2.1.zip
+        rdio-scanner-linux-amd64-v6.2.1.zip
+        rdio-scanner-linux-arm64-v6.2.1.zip
+        rdio-scanner-linux-arm-v6.2.1.zip
+        rdio-scanner-windows-amd64-v6.2.1.zip
 
 **Happy Rdio scanning !**
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 33e0491..2cc5c8e 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@
 
 app := rdio-scanner
 date := 2022/03/25
-ver := 6.2.0
+ver := 6.2.1
 
 client := $(wildcard client/*.json client/*.ts)
 server := $(wildcard server/*.go)
diff --git a/client/package.json b/client/package.json
index 2a6aae3..c5c06c6 100644
--- a/client/package.json
+++ b/client/package.json
@@ -38,5 +38,5 @@
         "build": "ng build --base-href ./ --configuration production",
         "start": "ng serve"
     },
-    "version": "6.2.0"
+    "version": "6.2.1"
 }
diff --git a/docs/platforms/darwin.md b/docs/platforms/darwin.md
index 5d4e7f7..711a083 100644
--- a/docs/platforms/darwin.md
+++ b/docs/platforms/darwin.md
@@ -42,8 +42,8 @@ ALWAYS DOWNLOAD THE LATEST VERSION OF [RDIO SCANNER](https://github.com/chuot/rd
         rdio@macos ~ % mkdir rdio-scanner
         rdio@macos ~ % cd rdio-scanner
         rdio@macos rdio-scanner % unzip \          
-        > ~/Downloads/rdio-scanner-darwin-arm64-v6.2.0.zip 
-        Archive:  /Users/rdio/Downloads/rdio-scanner-darwin-arm64-v6.2.0.zip
+        > ~/Downloads/rdio-scanner-darwin-arm64-v6.2.1.zip 
+        Archive:  /Users/rdio/Downloads/rdio-scanner-darwin-arm64-v6.2.1.zip
           inflating: rdio-scanner            
           inflating: rdio-scanner.pdf        
 
@@ -51,7 +51,7 @@ ALWAYS DOWNLOAD THE LATEST VERSION OF [RDIO SCANNER](https://github.com/chuot/rd
 
         rdio@macos rdio-scanner % ./rdio-scanner 
         
-        Rdio Scanner v6.2.0
+        Rdio Scanner v6.2.1
         ----------------------------------
         2022/03/25 08:38:06 server started
         2022/03/25 08:38:06 main interface at http://macos.local:3000
@@ -77,7 +77,7 @@ Here we want our [Rdio Scanner](https://guthub.com/chuot/rdio-scanner) instance
 
         rdio@macos rdio-scanner % ./rdio-scanner --listen :80
         
-        Rdio Scanner v6.2.0
+        Rdio Scanner v6.2.1
         ----------------------------------
         2022/03/25 08:48:03 server started
         2022/03/25 08:48:03 main interface at http://macos.local
@@ -95,7 +95,7 @@ You can use your own SSL certificates that match your domain name with `-ssl_cer
         > -ssl_key_file mykey.key               \
         > -ssl_listen :443
         
-        Rdio Scanner v6.2.0
+        Rdio Scanner v6.2.1
         ----------------------------------
         2022/03/25 08:50:58 server started
         2022/03/25 08:50:58 main interface at http://macos.local
@@ -132,7 +132,7 @@ Then simply run [Rdio Scanner](https://github.com/chuot/rdio-scanner) without an
 
         rdio@macos rdio-scanner % ./rdio-scanner
         
-        Rdio Scanner v6.2.0
+        Rdio Scanner v6.2.1
         ----------------------------------
         2022/03/25 08:54:08 server started
         2022/03/25 08:54:08 main interface at http://macos.local
diff --git a/docs/platforms/freebsd.md b/docs/platforms/freebsd.md
index 94f74cb..d7217f9 100644
--- a/docs/platforms/freebsd.md
+++ b/docs/platforms/freebsd.md
@@ -42,8 +42,8 @@ ALWAYS DOWNLOAD THE LATEST VERSION OF [RDIO SCANNER](https://github.com/chuot/rd
         rdio@pc-freebsd:~ $ mkdir rdio-scanner
         rdio@pc-freebsd:~ $ cd rdio-scanner
         rdio@pc-freebsd:~/rdio-scanner $ unzip \
-        > ~/rdio-scanner-freebsd-amd64-v6.2.0.zip 
-        Archive:  ../rdio-scanner-freebsd-amd64-v6.2.0.zip
+        > ~/rdio-scanner-freebsd-amd64-v6.2.1.zip 
+        Archive:  ../rdio-scanner-freebsd-amd64-v6.2.1.zip
          extracting: rdio-scanner  
          extracting: rdio-scanner.pdf
 
@@ -51,7 +51,7 @@ ALWAYS DOWNLOAD THE LATEST VERSION OF [RDIO SCANNER](https://github.com/chuot/rd
 
         rdio@pc-freebsd:~/rdio-scanner $ ./rdio-scanner
         
-        Rdio Scanner v6.2.0
+        Rdio Scanner v6.2.1
         ----------------------------------
         2022/03/25 08:16:36 server started
         2022/03/25 08:16:36 main interface at http://pc-freebsd:3000
@@ -81,7 +81,7 @@ Here we want our [Rdio Scanner](https://guthub.com/chuot/rdio-scanner) instance
         Password:
         root@pc-freebsd:/home/rdio/rdio-scanner # ./rdio-scanner -listen :80
         
-        Rdio Scanner v6.2.0
+        Rdio Scanner v6.2.1
         ----------------------------------
         2022/03/25 08:19:38 server started
         2022/03/25 08:19:38 main interface at http://pc-freebsd
@@ -101,7 +101,7 @@ You can use your own SSL certificates that match your domain name with `-ssl_cer
         > -ssl_key_file mykey.key                                     \
         > -ssl_listen :443
         
-        Rdio Scanner v6.2.0
+        Rdio Scanner v6.2.1
         ----------------------------------
         2022/03/25 10:34:29 server started
         2022/03/25 10:34:29 main interface at http://pc-freebsd
@@ -142,7 +142,7 @@ Then simply run [Rdio Scanner](https://github.com/chuot/rdio-scanner) without an
         Password:
         root@pc-freebsd:/home/rdio/rdio-scanner # ./rdio-scanner
         
-        Rdio Scanner v6.2.0
+        Rdio Scanner v6.2.1
         ----------------------------------
         2022/03/25 10:38:28 server started
         2022/03/25 10:38:29 main interface at http://pc-freebsd
diff --git a/docs/platforms/linux.md b/docs/platforms/linux.md
index 49ffb85..d78e7fa 100644
--- a/docs/platforms/linux.md
+++ b/docs/platforms/linux.md
@@ -42,8 +42,8 @@ ALWAYS DOWNLOAD THE LATEST VERSION OF [RDIO SCANNER](https://github.com/chuot/rd
         [rdio@pc-linux ~]$ mkdir rdio-scanner
         [rdio@pc-linux ~]$ cd rdio-scanner
         [rdio@pc-linux rdio-scanner]$ unzip \
-        > ~/Downloads/rdio-scanner-linux-amd64-v6.2.0.zip 
-        Archive:  /home/rdio/Downloads/rdio-scanner-linux-amd64-v6.2.0.zip
+        > ~/Downloads/rdio-scanner-linux-amd64-v6.2.1.zip 
+        Archive:  /home/rdio/Downloads/rdio-scanner-linux-amd64-v6.2.1.zip
           inflating: rdio-scanner            
           inflating: rdio-scanner.pdf     
 
@@ -51,7 +51,7 @@ ALWAYS DOWNLOAD THE LATEST VERSION OF [RDIO SCANNER](https://github.com/chuot/rd
 
         [rdio@pc-linux rdio-scanner]$ ./rdio-scanner 
         
-        Rdio Scanner v6.2.0
+        Rdio Scanner v6.2.1
         ----------------------------------
         2022/03/25 09:11:48 server started
         2022/03/25 09:11:48 main interface at http://pc-linux:3000
@@ -78,7 +78,7 @@ Here we want our [Rdio Scanner](https://guthub.com/chuot/rdio-scanner) instance
         [rdio@pc-linux rdio-scanner]$ sudo ./rdio-scanner -listen :80
         [sudo] password for rdio: 
         
-        Rdio Scanner v6.2.0
+        Rdio Scanner v6.2.1
         ----------------------------------
         2022/03/25 09:14:00 server started
         2022/03/25 09:14:00 main interface at http://pc-linux
@@ -97,7 +97,7 @@ You can use your own SSL certificates that match your domain name with `-ssl_cer
         > -ssl_listen :443
         [sudo] password for rdio: 
         
-        Rdio Scanner v6.2.0
+        Rdio Scanner v6.2.1
         ----------------------------------
         2022/03/25 09:16:47 server started
         2022/03/25 09:16:47 main interface at http://pc-linux
@@ -135,7 +135,7 @@ Then simply run [Rdio Scanner](https://github.com/chuot/rdio-scanner) without an
         [rdio@pc-linux rdio-scanner]$ sudo ./rdio-scanner 
         [sudo] Mot de passe de rdio : 
         
-        Rdio Scanner v6.2.0
+        Rdio Scanner v6.2.1
         ----------------------------------
         2022/03/25 09:20:40 server started
         2022/03/25 09:20:40 main interface at http://pc-linux
diff --git a/docs/platforms/windows.md b/docs/platforms/windows.md
index 64ba2b4..94b9ff4 100644
--- a/docs/platforms/windows.md
+++ b/docs/platforms/windows.md
@@ -44,7 +44,7 @@ ALWAYS DOWNLOAD THE LATEST VERSION OF [RDIO SCANNER](https://github.com/chuot/rd
         C:\Users\rdio> cd rdio-scanner
 
         C:\Users\rdio\rdio-scanner> tar -xvf ^
-            ..\downloads\rdio-scanner-windows-amd64-v6.2.0.zip
+            ..\downloads\rdio-scanner-windows-amd64-v6.2.1.zip
         x rdio-scanner.exe
         x rdio-scanner.pdf
 
@@ -52,7 +52,7 @@ ALWAYS DOWNLOAD THE LATEST VERSION OF [RDIO SCANNER](https://github.com/chuot/rd
 
         C:\Users\rdio\rdio-scanner>rdio-scanner
     
-        Rdio Scanner v6.2.0
+        Rdio Scanner v6.2.1
         ----------------------------------
         2022/03/25 13:48:48 server started
         2022/03/25 13:48:48 main interface at http://pc-windows:3000
@@ -78,7 +78,7 @@ Here we want our [Rdio Scanner](https://guthub.com/chuot/rdio-scanner) instance
 
         C:\Users\rdio\rdio-scanner>rdio-scanner -listen :80
         
-        Rdio Scanner v6.2.0
+        Rdio Scanner v6.2.1
         ----------------------------------
         2022/03/25 10:53:31 server started
         2022/03/25 10:53:31 main interface at http://pc-windows
@@ -96,7 +96,7 @@ You can use your own SSL certificates that match your domain name with `-ssl_cer
             -ssl_key_file meykey.key            ^
             -ssl_listen :443
         
-        Rdio Scanner v6.2.0
+        Rdio Scanner v6.2.1
         ----------------------------------
         2022/03/25 11:05:43 server started
         2022/03/25 11:05:43 main interface at http://pc-windows
@@ -133,7 +133,7 @@ Then simply run [Rdio Scanner](https://github.com/chuot/rdio-scanner) without an
 
         C:\Users\rdio\rdio-scanner>rdio-scanner
         
-        Rdio Scanner v6.2.0
+        Rdio Scanner v6.2.1
         ----------------------------------
         2022/03/25 11:11:28 server started
         2022/03/25 11:11:28 main interface at http://pc-windows
diff --git a/server/parsers.go b/server/parsers.go
index c931470..1c44f3a 100644
--- a/server/parsers.go
+++ b/server/parsers.go
@@ -401,7 +401,7 @@ func ParseTrunkRecorderMeta(call *Call, b []byte) error {
 						case string:
 							if len(t) > 0 {
 								switch v := call.units.(type) {
-								case Units:
+								case *Units:
 									v.Add(uint(s), t)
 								default:
 									var u = NewUnits()
diff --git a/server/unit.go b/server/unit.go
index c4a7026..bd15aab 100644
--- a/server/unit.go
+++ b/server/unit.go
@@ -94,8 +94,8 @@ func (units *Units) FromMap(f []interface{}) {
 }
 
 func (u *Units) Merge(units *Units) {
-	units.mutex.Lock()
-	defer units.mutex.Unlock()
+	u.mutex.Lock()
+	defer u.mutex.Unlock()
 
 	for _, v := range units.List {
 		u.Add(v.Id, v.Label)
diff --git a/server/version.go b/server/version.go
index 35071b1..f8d0d45 100644
--- a/server/version.go
+++ b/server/version.go
@@ -15,4 +15,4 @@
 
 package main
 
-const Version = "6.2.0"
+const Version = "6.2.1"