# HG changeset patch # User Bram Moolenaar # Date 1587236403 -7200 # Node ID 75589416d02dcca7c4b5b6d419ef7fd591ed2bd4 # Parent bcec8cadb7f745624d985ab9b4d9bf4fac80380d patch 8.2.0596: crash in test49 Commit: https://github.com/vim/vim/commit/ec9749f33d26162fad40714a7d21978aea10fc69 Author: Bram Moolenaar Date: Sat Apr 18 20:51:40 2020 +0200 patch 8.2.0596: crash in test49 Problem: Crash in test49. Solution: Check the right pointer. diff --git a/src/testdir/test_eval.ok b/src/testdir/test_eval.ok index 9ffa54157fabaf710b0af4f13d191292d206e785..ae15c9be80664a86a9eef8c9ee912c8658d37086 GIT binary patch literal 11268 zc%02zOK;ma5Y|~huQ?OmgOf!H+mh3!Uijc=5}@d%MK3`PlB_sh$dVz+ZG&L{`|>pu zDGe1n+1+doku;q7z9BU;9NK<*dK!=SD3WT=xYB-X;@(8aJ)iyFhdWLUE631zrP8I}@iX)@?yU|7}|){^0h&tcG~ z9Bbeh^mUReiFRd@=wcwbBK)sL^&qLP`D8fN15R}Ih>6W%ctQTXP|W z<6_WO7{&Vxtfi6bKp_+cW|2e{RJr5=8#liRb?%dkCOOwM2!t)-hF#Tkh)b<2;vKRi z9KsR$2xEn1bMr7;#BWy&S{IeOA71p$b?vuLL0GmqBe9>E&Jj4s)W`vUW0&Ya<|@o! zJ65$~hVRE*r`mm$Rc(8=tEt_Z3mVly>8g4;!(s^-xMq_^VW4h3Zv;yWUUGTO(>Zh( zA#D9~G#Td(S5nP{vZ{3(RxNO5E??n1G#yz$3!)rZppGmYuB2KHWo5P`b}iMRNJkbn zM^q3kupp8Q{J)A3a}ojs^Xm{R8Da}p_{hbLKwCmvr2=h<1=`Z#I;x9OMrM~~*HTTF z%O#CQ;>+h}+Xu(Gb$eADpctnNkp7}jmwfnX|kbb(6&HjCsGk_e)q2RQ0hZq`n8ZX22?}l zBm1=oH$jwWyS1_4Q(pyUjj1*wmwD%PhJW-(NlYdtoSu3`IoK3)rcd{kPt2Kn)R{VZ-2-eKXn|6%y3fY*q>ATA1vGw6@g1R7g|9qW`1LbfyJi*g zu8`RyKM|oHw8Xy9(*j*Kl77-ihE~-oJA?@B*kpu zRHqj`^5Cw1;5pV7`WD}nu`5QR1xZsp8x_F5QH)%&t9q zG+zZtTOz(3)Rv-R1(*_=tWK3Po{D+3pL}f1Sw}v5?Fp#)Dp*>R`Ng2xE~RZ#MCLki zK;&Ub?^G#w(HHA*(KkM2=(nZ6@R}R9r?cj^q-rY-uYuLd#xZ}*5+hfR<66%tUp^mr zU>Uye8`(R2@9}#_JouG-C`D9*O(#Ih5`~jRg8{*v?=&D(L3ybIdfEE#SfQ*@ds)hu zr3+?m!=_Q@sz!DgnNBc4YuqtP=o`?h zV#`ouh2{3HGIkM5>xp-mn9eXkpKXT>ZD%dk5S#< zf*;yF1|r^#Fn5)$ix{F`Xp5RV3{7vCpz?-2`P#@3gz$Dk?aT0!!6#!MVbHS5b5M2b zI|v+X0jebbgYQ_N;Zw(d#!cfh&Hsr@>U#@;r(P?7i5DxOv=I{s8jT>2 z9!QX`_&npH*koz#*Ev0S^*u)3!#1d%oMO*hFsWuygv~*izz>>w@QWrC*=d1B{g+k>-Kl;s_4TnR<1LAj%`VJ>eC7V$*n89% ziL$he)3V?sO|iy!j159rWZSrWV0~$v6frk7MHEVC`1qsO4GN%H&cTa!SFb04z-*7jA z{P8d(I?vm?S31<`btp<_K>v5Vj)``8>9Zx_MQIn5Wt^wA;zTF}<%x5;tdAt6uZ{(6 zut`bzGb40qw^=TK$YkRmzb*fOu`_b!#vQvJzM@PGVuyv8M?-8WpGg{QW3t^-lcEgr zQXCfp%Dvl^LBf3N6r;|FtVirOm@>CCw9Ct39W4q{eToz;OIXx~7KoQQ#IU^6Gt&9Z zWor?djJ3c diff --git a/src/userfunc.c b/src/userfunc.c --- a/src/userfunc.c +++ b/src/userfunc.c @@ -2504,7 +2504,7 @@ ex_function(exarg_T *eap) // With Vim9 script the name was made script-local, if not // found try again with the original name. - if (p != NULL) + if (up != NULL) fp = find_func(up, NULL); } diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -747,6 +747,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 596, +/**/ 595, /**/ 594,