From 95abbc35e3d1c812caeced64440f1eeaddd268e5 Mon Sep 17 00:00:00 2001
From: hedgecrw85 <will.hedgecock@fazecast.com>
Date: Mon, 2 Apr 2018 15:38:20 -0500
Subject: [PATCH] Fixed null-termination bug

---
 src/main/c/Windows/SerialPort_Windows.c       |   4 ++--
 .../resources/Windows/x86/jSerialComm.dll     | Bin 103424 -> 103424 bytes
 .../resources/Windows/x86_64/jSerialComm.dll  | Bin 121856 -> 121856 bytes
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/c/Windows/SerialPort_Windows.c b/src/main/c/Windows/SerialPort_Windows.c
index b0be1fd..2eae251 100644
--- a/src/main/c/Windows/SerialPort_Windows.c
+++ b/src/main/c/Windows/SerialPort_Windows.c
@@ -272,9 +272,9 @@ JNIEXPORT jobjectArray JNICALL Java_com_fazecast_jSerialComm_SerialPort_getCommP
 					for (j = 0; j < serialCommPorts.length; ++j)
 						if (wcscmp(serialCommPorts.first[j], comPortString) == 0)
 						{
-							size_t descLength = strlen(devInfo[i].Description);
+							size_t descLength = 8+strlen(devInfo[i].Description);
 							free(serialCommPorts.third[j]);
-							serialCommPorts.third[j] = (wchar_t*)malloc((descLength+1)*sizeof(wchar_t));
+							serialCommPorts.third[j] = (wchar_t*)malloc(descLength*sizeof(wchar_t));
 							MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, devInfo[i].Description, -1, serialCommPorts.third[j], descLength);
 							break;
 						}
diff --git a/src/main/resources/Windows/x86/jSerialComm.dll b/src/main/resources/Windows/x86/jSerialComm.dll
index be71d5fb2b2612191f5ad6677d2a346f7c13ab83..06d584701fbfb916a2be2c451bcb789347e346eb 100644
GIT binary patch
delta 210
zcmV;@04@K3s0M(j2Cx_b0>hHC8UdCK4P*fT0E<K<T!p|7gjkck4kZsM0RRArL?jS7
zL?m1fh8vUd4kH%X0001uL?jeY|1<v;ARqw{g}@Jm#FHuyGXap3UJpksOM}C}i}Q_6
z0cMbj21bOyb@_`#Bp@sCgT@H|G`Q%tJOBWL!~~55Hc;rtlhO}13-$j0|BGBC3{&W7
zlM@g!0kV@u5Gw)PlX4J70cNwf5Iz9`XoL3=xAzeNtyBWTlDDR20m2;%={qDmWISp-
Mcszo)bA$nn4-_FyY5)KL

delta 209
zcmZoz!Pc;XZG!|OQ*Pg8DaL8Mys3-~4Baj&F|7yqTOud#<x}O?0*Z9Hs0dgBMfuxg
zCV%8p7Q4m3z|iZWA`<Z5_`j%v0;2#>dF#>1TKvY06DP;<yX*QiA3o6ixz~>|Z9*5D
zTg!pcpFl$uv_Jkg+3{kh4Ff~-5td$-QYN4=0WXeCzQ}LJ{pH{P|J^YvJi#wACJPA|
zF>ajfDxl4Hdvc+G+vXhtc8rXf&EEyLe-~t28v=Cf_GM{|hh({5S*zNl+GN{Q+B9!3
JZei@@2LKg)OGy9#

diff --git a/src/main/resources/Windows/x86_64/jSerialComm.dll b/src/main/resources/Windows/x86_64/jSerialComm.dll
index d5e8e23613a2d27e0608ad4259236432a5584ecb..3cd5e4cb13243d18c99f41d345f3ef928229b688 100644
GIT binary patch
delta 52
zcmZqJ!QQZgeFFz0)22zAxfr+d3p5|*@aX3G@Zzd71A|8|k96~Sf$ir77+YI_Dz=AB
IWnAS300o>B1ONa4

delta 52
zcmZqJ!QQZgeFFz0lXc%_F2=3=0^K|xUfgtMVDRYWiDhD7U}!!su>HIMV`~dg#rCkN
HjH}!L(d-ex