From 1b489bcc11e83631cd62f41154573120a2c104fe Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 26 Jun 2021 11:39:53 +1000 Subject: [PATCH] Attempt to fix java 8 native crash --- native/src/main/c/NativeCipherImpl.cpp | 2 +- native/src/main/c/NativeCompressImpl.cpp | 2 +- native/src/main/resources/native-cipher.so | Bin 40344 -> 40336 bytes native/src/main/resources/native-compress.so | Bin 113784 -> 113736 bytes 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/native/src/main/c/NativeCipherImpl.cpp b/native/src/main/c/NativeCipherImpl.cpp index 22c7f00c..9de328ea 100644 --- a/native/src/main/c/NativeCipherImpl.cpp +++ b/native/src/main/c/NativeCipherImpl.cpp @@ -6,7 +6,7 @@ // Support for CentOS 6 __asm__(".symver memcpy,memcpy@GLIBC_2.2.5"); -void *__wrap_memcpy(void *dest, const void *src, size_t n) { +extern "C" void *__wrap_memcpy(void *dest, const void *src, size_t n) { return memcpy(dest, src, n); } diff --git a/native/src/main/c/NativeCompressImpl.cpp b/native/src/main/c/NativeCompressImpl.cpp index 4574ccf1..b490ede5 100644 --- a/native/src/main/c/NativeCompressImpl.cpp +++ b/native/src/main/c/NativeCompressImpl.cpp @@ -6,7 +6,7 @@ // Support for CentOS 6 __asm__(".symver memcpy,memcpy@GLIBC_2.2.5"); -void *__wrap_memcpy(void *dest, const void *src, size_t n) { +extern "C" void *__wrap_memcpy(void *dest, const void *src, size_t n) { return memcpy(dest, src, n); } diff --git a/native/src/main/resources/native-cipher.so b/native/src/main/resources/native-cipher.so index 78c26f28e1e555f59654e8f104c3f0d7b58e8a75..8ac128df6f1ebb309238cda9816d083de4fb685d 100755 GIT binary patch delta 1616 zcmZ{kZ)j6j6u|Gzd--e9BwD#XS2WSMrhYJ~a}<@WDH|9CHAOqzD8?WK3s#%z{^(qr zmTg$uLb9{XA}glD4}v0z55K7UP_|(m4qKFd)F`MMRv{mR!F2B2+*242cF4K+o%1{Q z+?(^xedE_`dHh9rpwQIf-VASiPQyNwtC91^wGiGv%43!Y`7_L5LE{1 zs4i4H4{aMBV!2QvnHx$urpLehF{J0Fk{k?ewebc;wpnlNn3;#X z7S|hFFFl57EzUcE+Xer-Hhu+@x`2efj31FtJOe=-uh*V`t&L-~@iUm!WBiO<1Epad z&gu0Kx5xP;WbDGYpfR?X)v@?4wX<7IEC&UohE35xT)8`m_Q4d=D_qgicIAGb=uN01 z-9(u~3FW>+GzDRYFfOAd_nld*+&eK^N)g%}f_K2AQ*15M?v;&-olp~dP5TB?%JB*L z?^FD~P0I0%{QIGdJ02vOcw4y_{^>S&fOHX^w)Y)H8*mRPBM@{7;{~lvZC2iuXiM1u zZAf<#ouMink}n_SHe{Wm`42j6Xr1!TQ)WhfMinp=W;b9Kb4C`<)2iGhqTd2{2_r~r zOKX&yCN=@hu7kdG`qRElZ@Qul!m7QntY5P;@W91x@{DZGUO-TmOz=5sxE9 zW|mTcrhynQ!iNJZdBQw4khbvzR0o%8PHdj)px~97!;Qn~L&!p)9=h ztN&Bq83>*d#uK6`>Xk3(jp{IoG=!Gy-Tb>M=bV~Y3uI3To|G|sZ*An%A6RiqO{ ztsOK6;Zb2cC7MsEzt%(ju0uQ06%M+)bT1cbx*i6RCW)3JYV9vnodGB#1)|n3$|ZO( zDjFUUW%M-))7pQ~FRQbhEyFgDwYPqA)y*@eeXuX887>L>{)pKfs%$-;(1t3p-H6N=koz>5uj~)9k9Pffe%ABLP)y<| zHtDEi^JA;w?78tg8#Oz3j^QC;vL^kaV#=5zs_dObfbzxaS-{m%Km?)0afejKjpt^B+b zc|=+uQIp`8pr=L{3mRi}EW{EosAU6cU_~e*-Re;^l2GPXh#rG7(yzIq)*fYkhUibQ zigY*4Y<4R14@7$)<`u?O)a1HLTb22F^p-LY-Cn`3z!>^O+|^Tx4XS}vU>@mV)Z`4- zCT0GL=zDMz>3+(s@RTxNC)x;6pV;*=QIl5hCF-S|Q#+JlBW57wS;{0=wGRiN-zSU} zcP+}ZkD~s8IiE<%J(GEULV3D79Hl5mIXIPozCXe>pWu%}bVBg6!2QB#B2SBI!!41E zko3RtP~V}x*K`&RZT7PNkOp1BSGRMfv1R>R7Q#U|5Zc5|ct4aeVrmYj|Dd209}dlM zH`K~Ez@uRS|AvB)3U|OG7+DGjji&oz7VnGM3}1v>VJaN7?}YD!FPSZ`@nwh)&w2tn zd^@~1YGGPZ)eZ4*DmA5!cnheHm9CZE9doz#Mv}oc^HfjUn>P zJ*iw8Y0e_>Nx{!Ko@Gc*isX{(xmS6X$nzH2tBd3w^h^q)u|{RGvRy^JOPM?dMWlO( zR$rxqP)0gLG(yGcUZQDOMS6~Cb!n|YY)Tk^5iL-xTi7A!M%v<4SuIgkZee%87}7M+ z>gzcU^GIiiRzEDC!_6tt_y^1G-KK<3*y?kJ^CU zf8weJq3JppUK4?i+I28nyB3yf{V-Kr75{gI-Yh-{7i!nT>44Y1Fnva|QzuO>D|6t~ twm>?l4kHbpooWwQq*-tqwF+rittDhs!=+H$+ z(PW#3AMIJZaYh9a#!R-wiqeo_+|*?7--wxkM6(ex;~z8HL^EPA^IYz!AupcfO*9wbEN3?7C|@u&4j_-Yvg=-1~ay?c<;8 z65orS2Y+ed*!LG2cWYZ%)Y*ROB^@9HgRv_AnO_K^M&1{6Vq z=H*FPvWFq02l#u?pc{M<`v!FD0o`e*7#Pv3cp=Q|hIz$?8cwnMODuqvR1Iqdo@1EL z$qb}BHu5z+Li7=cApILfN!vFm`8%Q-bRd0_D*tm%$#;k*AdzD<)ljajTFDO)l~J;0 zP_7tln`+owRBiQw5{fj{o`DRGbtp^EEA>Unib8pAn9o8q*Dy_r@y8WhrkF8^BOSw@ z9JfmDHrlhQVZT8Nse^KRk12VZ+71?kC8TF@E;4sJtz|Feo&=A>Fsq4n(o*)zbAZ+Y z4M>-Xep92=qpD$#LXX3MK3BlJpT5Cpz8aL$nSfEuAESM|O8YfL`O`3uv>tOk%w+AO zDi^zJ_5*OIVXo5HzQ>eWimR0NJ4BEkr^>UtimpQjX_}}`C-Nl~#2$chmtj^CU5P8Xkt*MSsLN>Tr*Tsm zMVEEeo~EpWDb;_NW}6}X6Pn3=3bO++=Q@|)cI1_g?zUKGY=8F~lkev}qfP$lKFwjc z;LXjPX)K1jSx5=Kt}eXlHg<%x*NVHG3}fPx4;C(KJQqs6_%$e4Hh+AoCZ2=8ov_Di zK(jX=y1jM07|wgcJOn?ZHsjBCH;$;tT#O8Y+h@Q}-hB5{>r@|X_Zen|EK7E99n~S` zGu-ka%33dUV3o7JL)-y=f0&oSPJf%Z{%KlRmtT@@=;KFS{lTdq4;%RUo?1$lbCl)~<`55S3k71=5Z}mK(_KS+Lc=6ak{gj$`5Icx#&X%h|LP8` z){x|Wo0HY1dy;&2p?mFtp!GV_b7TAkO*D@4LbDn-T|(>kuM<7v+%TI6TQ5tW7?t=G z;Z@5kGA`yN{(`XeLVPXw8N_ph>)%mJi_i*x6cNNtHwjxWTZZ%vmM8WO>DGhp77008 zu}iJgdWSZN%MynP57REuoLGy5d+nbpo?e>ZTb=1}ihpM30kQZM4|`^@xU_6LAj~P0vu7sT_KT-c zc4dzYp0wl?)^gB=bcp#WUgON3%i6Rj&9B(`<6`k5$~Pv|mBQLHyatbSbcR>{3$XS) ATmS$7 delta 2117 zcmZvdZA_b06vyv*cv>iLYuDn#GX&dYD8y-DkPTn5waFseU=z$t%p_9g$cBauG;A~R zWjIDMqr-BxT*;VH6Gpa>Xotegm>J=NXqGs9N&I4f5EC}Vgb!w&3Da|XPZLIVlGEFJ ze)oUQy|?$?P9>a)g!AJPxDqYh?3&6GNt=qd95xDXG*^Y5dg0gyS5E!WJYU%rj=pP^ zDqKvSjsFVVq8T)AZhX@fEB!_m~S4aLu&A=@s8uODj7?6XeiF&1krDKCKpC@xRGfWE;%iD8C~f?`zOwysMIi<^Os|Nx@8YD z4dm)@A=6>(BzlLdhfZj1YM1;NCtAhpD!6+;y^M22V?4LqxTbq`BetL?!?F*sHn&I@ zOl4lgaE4XBn`Y&qlQUbU={DBxWL1n8;o*1;W0Z54XM2rNfk(ka& z-K71A;IeEV&(^nFM+>R1>@JoQjdJFxS{<#`DMSM{5k1O#xW7!(F6t|L4x>b8n3|h( z^eSt2;{?%VuKN+6jns;6;S$jwnL57G+Shd>c3~jXvbQo#bn5VS&U_o|Gp)5Ba^3in zrt=PbEu#o7V<$;nypf-B*(W*iA&h4ZKeV^JqOtMl8%=GEt<9~kw!Kw%q^{;jD^6rr zjPz%f7&-UBk;$BMfDLQj4(c2r3~`dut9!4^*V2+BM4IT~SjV~+m!L6yBjBDl>cB;! z{Kh56L{`vZEc98ns++R56*L!j`7B7sX5Ue8;qSg6_%SE15q#L1XW_Uvd!#?FD)W8+ zs2}nV!AWVKhWB7r_ML`DU{HQ@8lLyGd39nnQDq@%_dw8ayXDRvD1z>>mL3=~NaX1S z3%X^v7xF67g*&y2T9y1v6B#1(z_?4ajkWhejT@5B-`LI1A!3yJ*K0BDdeS!27xknp z^Yir|$7^MH5G;ES>~dtCwXt;T^6_J=fLGgvIgIN57ckBgb`~eVlHijH+r|2zx}H zxPD$Qs*Z8BoKW}xt5-k8$K(=WvzxGt^@7(B12Ql~g5OxM`sOdndWG*Xj_`xDpUYLs zPK85RdU0j^12r&yN5%<5-`Mv