From c4a55fcaa02098f45e5826ed7dc45017d58533d2 Mon Sep 17 00:00:00 2001
From: Artem Prilutskiy <performer@aesyle>
Date: Thu, 29 Dec 2016 11:57:21 +0300
Subject: [PATCH] ..

---
 CallCapture/CallCapture.cpp         |  2 +-
 CallCapture/PatchCordProxy.cpp      |  2 +-
 SVXLink/echolink/PatchCordProxy.cpp | 14 ++++++--------
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/CallCapture/CallCapture.cpp b/CallCapture/CallCapture.cpp
index 39d4d99..3243d62 100644
--- a/CallCapture/CallCapture.cpp
+++ b/CallCapture/CallCapture.cpp
@@ -92,7 +92,7 @@ int main(int argc, const char* argv[])
       " [--identity <identity>]\n"
       "\n"
       "Expression example:\n"
-      " (?<alias>(?<call>[RU][A-Z]?[0-9][A-Z]{1,4})[^;])\n"
+      " (?<alias>(?<call>[A-Z0-9]{2,7})[-,][^;]+)\n"
       "\n",
       argv[0]);
     return EXIT_FAILURE;
diff --git a/CallCapture/PatchCordProxy.cpp b/CallCapture/PatchCordProxy.cpp
index 1a6b5ee..73bccde 100644
--- a/CallCapture/PatchCordProxy.cpp
+++ b/CallCapture/PatchCordProxy.cpp
@@ -48,7 +48,7 @@ uint32_t PatchCordProxy::getTalkerID()
 
 void PatchCordProxy::setTalkerAlias(const char* value)
 {
-  int length = strlen(value);
+  int length = strlen(value) + 1;
   size_t index = VALUE_CORD_TALKER_ALIAS;
   uint32_t* data = (uint32_t*)alloca(length + sizeof(uint32_t));
 
diff --git a/SVXLink/echolink/PatchCordProxy.cpp b/SVXLink/echolink/PatchCordProxy.cpp
index 2e0e94f..73bccde 100644
--- a/SVXLink/echolink/PatchCordProxy.cpp
+++ b/SVXLink/echolink/PatchCordProxy.cpp
@@ -48,19 +48,17 @@ uint32_t PatchCordProxy::getTalkerID()
 
 void PatchCordProxy::setTalkerAlias(const char* value)
 {
-  size_t length = strlen(value);
-  const uint32_t* data = (const uint32_t*)value;
-
+  int length = strlen(value) + 1;
   size_t index = VALUE_CORD_TALKER_ALIAS;
-  size_t count =
-     (length / sizeof(uint32_t)) +
-    ((length % sizeof(uint32_t)) > 0);
+  uint32_t* data = (uint32_t*)alloca(length + sizeof(uint32_t));
+
+  memcpy(data, value, length);
 
   getContextBanner();
-  while (count > 0)
+  while (length > 0)
   {
     setSpecificValue(index, *data);
-    count --;
+    length -= sizeof(uint32_t);
     index ++;
     data ++;
   }