From 63e37acaac9fac9df9122ff7344491b14f430497 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torbj=C3=B6rn=20SVENSSON?= <torbjorn.svensson@st.com>
Date: Tue, 3 Sep 2019 17:33:47 +0200
Subject: [PATCH] Bug 550702: Fixed memory leak in SerialPort.open0()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I2bb1cd8c19addda7955886b8cb582d0effe64f4e
Signed-off-by: Torbjörn SVENSSON <torbjorn.svensson@st.com>
---
 .../jni/serial.c                              |   2 ++
 .../os/linux/x86_64/libserial.so              | Bin 13408 -> 13408 bytes
 .../os/macosx/x86_64/libserial.jnilib         | Bin 13756 -> 13756 bytes
 .../os/win32/x86_64/serial.dll                | Bin 126038 -> 126038 bytes
 4 files changed, 2 insertions(+)

diff --git a/native/org.eclipse.cdt.native.serial/jni/serial.c b/native/org.eclipse.cdt.native.serial/jni/serial.c
index 5e783b61c7f..216169c041d 100644
--- a/native/org.eclipse.cdt.native.serial/jni/serial.c
+++ b/native/org.eclipse.cdt.native.serial/jni/serial.c
@@ -56,9 +56,11 @@ JNIEXPORT jlong JNICALL FUNC(open0)(JNIEnv *env, jobject jobj, jstring portName,
 	if (fd < 0) {
 		char msg[256];
 		sprintf(msg, "Error opening %s", cportName);
+		(*env)->ReleaseStringUTFChars(env, portName, cportName);
 		throwIOException(env, msg);
 		return fd;
 	}
+	(*env)->ReleaseStringUTFChars(env, portName, cportName);
 
 	// Turn off all flags
 	fcntl(fd, F_SETFL, 0);
diff --git a/native/org.eclipse.cdt.native.serial/os/linux/x86_64/libserial.so b/native/org.eclipse.cdt.native.serial/os/linux/x86_64/libserial.so
index 3b73b67c7a90a5f4ddaa29b807f4dd6b40d394d3..268ae8165e20d3f511c2117849f687600d97bfbb 100755
GIT binary patch
delta 876
zcma)5Z%7ki7=Pcpn{H#9-getW%au4aGTammKa|ao4nL&((m$*u#Y8F`Mo^y&TC~oA
z_Dt|YWI=@eA%vqS11Sn3l2#uI0-;F}t1K%hU1o33-OhqO^};<r-skr`zxR3XewXS_
zbq}^%1rO1e;2G+f6cbW*_XnY#j!GMEcI=w@lzZ>%?j7UR54yT~?Veh7mY(J4YlsOx
zF(_oaBua>r*hmN57PinRP?NV>HWafJg!CIVf-{?WWe{(Te1l7EHudIGfIGGd8i6;q
z^wvIE86Nw^m>iFO)}i)v4k2>v;VrE>9bQ68iH>NLLS&`C)r73kqTD#8=i@pZOR}dh
zXLoPgfJr5KQKLrQ*?F!0zXh^=6WZC6+Rc~e$SgvY!%g?8O^!xd(6Wdp44>Cdh)2f}
zVlQyw^q4xDS3`>u87)7o<+E~=njG?vGw?CLkhXwXTt)Z58nL;6$J*%KqlL24l$PVQ
z7dZXy=>bs0mE83OxFYt`1F+WF#wF(==4|qI&oefN)eD_+jo`09;lrkM-#iw|u+9~s
zBQWY}HXr=X*rWS|z?^Gm{nR(cI<asXTL%!&EiiTsG5M3RDa0>`vxvR;u5I|KT5#}6
z#H(;zDyQvm8KVr(B;V@ysGu7n<j6nCZMNs|m4YqTOjcm`349hobo=NM1TnTj7-JDc
zFm6|e++OpU;!T_^sg1=?c+?A(xOoQ&>zGFph+dk~cIu&$ACw~==qWuy6EIV{7p)lb
zSE1=5exGI8kRO2ZUKsbcq9$-<mxBMgZW`aE=GX=oPKGN7ucR$2Izo4{`m$`lg+7N+
mpvt;zWz;$rsI!I*XNM)22-I2r{xX@sdP~Y6Q)+#%oc|5Nwl;eJ

delta 864
zcmZ8gZAep57(Va4bGk7<?%l4dNSC&$LExroNc+(Y@nS^zBS;AAhmh?@WJpkdG;Fc4
z2Ih<4kHCTqgB8N{$1)m`U<eTeAxM!QL~JHC3O^?4?Y;YGumksf&Urtc_ndQ|v)sGf
zJABy~mRM?pr3c=q;I^b!{}EeY-12+cHRPH5bb1X!-oyP({`0R5zm#=&$Uz7LI-BsB
zPghxhF_D>AF}~EbLp?%)wIN|n$Fg=Xlk-AIdzLbR?-_qwR5}W-7s3gAWvYYy_{|g>
zkmca$<esX^AzvZ|O$~a+<iNX#Rvhcx)k34GP|!D~Wds%|8tbKL(Dy`hjKx<u#?p%!
zttzS`lVv#jH^nfO%MUD2eT3XWUqpFa;s%(&uchU%r)-oqLi1WOuOO;%Qc2ZLuB9A2
zv)v;%njCc$>o15+V7G7xrg1>%*w;k_zBjiH$icRl9BLY;&1pMc#TB7~(<Mj5L3oRI
z#EYC`8<)g3YjjIhhbdVj)MW|hw?;%6hs=HO6F1Bq`q@oYou9>aOIM4Xrajd5*tV+P
zC)^|q6Mm#4y(j!bxK4P3?#@J4-$_S5O86WXEwvCqkZR!(9+7NStyG!%!Jd+`d)%pF
zJ-@)43X9l5s=iC#E?$*vpkjb*H$Ed<f%9a$l(=Lq!m{!UBb6t)gjs2={J^{N<v;|C
zXC*9|CzG_ll)2GUZ3RCH)sk|pdIz{k3BC54;KmjEC6b@VQBOkabJz@75&l5ntvKa4
zM?I0NdFskn+84TOO{H;BYr>eGj;#$NsW_!xWwGXp0S3_HtT$%&OI){|&Bp9DlV+T8
WHXCx!B<VbE@Mj*6UukjG^8Wx2`X}uG

diff --git a/native/org.eclipse.cdt.native.serial/os/macosx/x86_64/libserial.jnilib b/native/org.eclipse.cdt.native.serial/os/macosx/x86_64/libserial.jnilib
index 9904a21906232a1a7259e14923a344cd76824791..4676dd78dd2d8135b43f36f782a41fdf251884ce 100755
GIT binary patch
delta 446
zcmdm!y(fD@htLIK1~8b&1)(npZ=AJ{S>P^v%N>gi)&fhnvb}tK;j`oB43-T3$qFJ8
zOe#E+twb8@m4WIzTXX*X|KGe9L^AOARsu~h{I-LE5h!!WqnGyrP>DzH-VZ=opYGNI
zAhm(v#X(M>V0Z5fAkU+l)1$jHfE6UL7b38=11vrjq`0#+1W5kB=+V0sWCT>r3ki_=
z<oaHar5>HV3xL$iT`V9oS|Mg|zzsz<&7<@9|BKyVr@9&*aP2s_52%O1rSp(W$B7r-
zKu1C3fR?QQn%LPI03=_81I1msdUpcZjtwU}Tspwa?x`*RHm8XSFiCx91KGPZ0Vof2
zo&Z=Q4@l#a$rHqF7-ct~72nLrC_A}PQj(E>@@z>d#*oR|Bn`wHfp+uDGkpI0|34d0
zxjYbC0P!ZN1FTFJgeM=8S7S0@+x$v?xggU8^~sYBRaq{mZ{V4{$It~Ry_v~q7c&4~
Cd)!|D

delta 380
zcmdm!y(fD@hme8@0~k1RL1+b$jkESK3;f<K<$w2$$@|^A6vI^?ownVa!IHs0`2$P9
z<O{+QOjo!kzY=b&zs$+N(Ak>v@Bjbiy&#f-zc&zQis82%42(dTLms`n4M1Z(diQ<+
z%KCJ-767RY3@-|S`aF8Kf&@Lf_s#%Povk52^2G-hphR*n$SjY}-UUGFWj|1;8*IAa
zfsTXwfIOhV9VcFRb22DFC4fe)0Gkm2G9w&lcvtUEAhY3Q$L4rZDJH33Y(QhXw<Z9^
zfc6Q1)$)MUKA${U+=fwR^9AwEjM56MAg6ouP6ZhTv9h!E$zPx{p~>?kr5M8}@02u<
zY5}?+ZNe9zFgsA00uWmQF~7V6!zQT%tV{|blMl(OF+E`2{7QbgAkzYk$&(FLSr%wK
R;GVq4&;=;HnaOAuGXP2HxZnT)

diff --git a/native/org.eclipse.cdt.native.serial/os/win32/x86_64/serial.dll b/native/org.eclipse.cdt.native.serial/os/win32/x86_64/serial.dll
index d2f654037b591222e1cc2a7f75bd7ee7771fa31d..e1c1019bfa5429c194f792440c01ebf07cf3bc7d 100755
GIT binary patch
delta 33
ocmcb1gZ<hK_6Z$K1?&^M{FuD6Hr~>*1#+6%?6$MnF$Syy0PG+PNB{r;

delta 33
ocmcb1gZ<hK_6Z$KpV%gL`7!xtZoH*s3*<Dj*==XDV+>da0R8+8O#lD@