From 4587a39f46b7e09e0d695a9ea3e768df4d751c83 Mon Sep 17 00:00:00 2001 From: Hermet Park Date: Tue, 9 Nov 2021 15:05:55 +0900 Subject: [PATCH] test capi: fix the memory leak. target is dangled without any proper deletion... --- test/capi/capiPaint.cpp | 18 +++++++----------- test/images/tag.tvg | Bin 1829 -> 1838 bytes 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/test/capi/capiPaint.cpp b/test/capi/capiPaint.cpp index 8cbb102f..c0b17af2 100644 --- a/test/capi/capiPaint.cpp +++ b/test/capi/capiPaint.cpp @@ -216,24 +216,20 @@ TEST_CASE("Paint Clip Path Composite Method", "[capiPaint]") REQUIRE(target); REQUIRE(tvg_paint_set_composite_method(paint, NULL, TVG_COMPOSITE_METHOD_NONE) == TVG_RESULT_SUCCESS); + REQUIRE(tvg_paint_set_composite_method(paint, target, TVG_COMPOSITE_METHOD_NONE) == TVG_RESULT_INVALID_ARGUMENT); + REQUIRE(tvg_paint_set_composite_method(paint, NULL, TVG_COMPOSITE_METHOD_CLIP_PATH) == TVG_RESULT_INVALID_ARGUMENT); Tvg_Paint* target2 = tvg_shape_new(); REQUIRE(target2); - REQUIRE(tvg_paint_set_composite_method(paint, target2, TVG_COMPOSITE_METHOD_NONE) == TVG_RESULT_INVALID_ARGUMENT); + REQUIRE(tvg_paint_set_composite_method(paint, target2, TVG_COMPOSITE_METHOD_CLIP_PATH) == TVG_RESULT_SUCCESS); - REQUIRE(tvg_paint_set_composite_method(paint, NULL, TVG_COMPOSITE_METHOD_CLIP_PATH) == TVG_RESULT_INVALID_ARGUMENT); - - Tvg_Paint* target3 = tvg_shape_new(); - REQUIRE(target3); - REQUIRE(tvg_paint_set_composite_method(paint, target3, TVG_COMPOSITE_METHOD_CLIP_PATH) == TVG_RESULT_SUCCESS); - - const Tvg_Paint* target4 = nullptr; + const Tvg_Paint* target3 = nullptr; Tvg_Composite_Method method = TVG_COMPOSITE_METHOD_NONE; REQUIRE(tvg_paint_get_composite_method(paint, NULL, &method) == TVG_RESULT_INVALID_ARGUMENT); - REQUIRE(tvg_paint_get_composite_method(paint, &target4, NULL) == TVG_RESULT_INVALID_ARGUMENT); - REQUIRE(tvg_paint_get_composite_method(paint, &target4, &method) == TVG_RESULT_SUCCESS); + REQUIRE(tvg_paint_get_composite_method(paint, &target3, NULL) == TVG_RESULT_INVALID_ARGUMENT); + REQUIRE(tvg_paint_get_composite_method(paint, &target3, &method) == TVG_RESULT_SUCCESS); REQUIRE(method == TVG_COMPOSITE_METHOD_CLIP_PATH); - REQUIRE(target3 == target4); + REQUIRE(target2 == target3); REQUIRE(tvg_paint_del(paint) == TVG_RESULT_SUCCESS); } diff --git a/test/images/tag.tvg b/test/images/tag.tvg index 3e88cf13d685f713f0dc3fe0d9d7c606ed668732..5d76b960e9e91b6fad7266a5ab7858450bfb1876 100644 GIT binary patch delta 1811 zcmV+u2kiKz4z3Q66@S0091`H2?s>AC3Y8VGtMyK;giCiWUl)vJeb} zg%>db0QBRc7>gO9VCnL2;KmX!YWyQZVxbpqCx%?ClV)1Xg{W|>5Hir0&5R{~0BN!C z;J}6e0tiqFU}jC8L!_;mK;&uEsTI!DY&ryM&3%D} zc?&?m6tx4*4LM2@z(1ix7amQzRFStHe{;<}j5u*%#h)2BcKnDjUDOb_fy>5j{{M z#nr=!tNz)VuSt|DSq|(%0-xC4k=pwKHux4o;+_ZuTnL;c^yAMz0Au`# zK;r;FPO#+$n(@W}rRf5WA%!UNNDgBXl1UFi1i&=(fKm@66kmH!wt;|nF~Yx zRRBD-)zodmu<2F+fQYqLE?e~ph*MKNwbzVtU8tWO7J_u3f2j3~M<3a|e+USSRvlHN zTYug5Hu2(!_O8Bw7-OLY7E*xC<$xTh5t|rLl@faGwP^@dF|nx$RXNcYV0;H6g- z9ta73ZCVz9c@-X_pFzxxv<^!bV&GkP;{^m2f<3m03!8osnPi((P*oO`Rkn!+Rc~<_ zW}Bq22^N}dwkZRfa?zP*e|-HhfKvbxT4-nh`e7uZDi#VuAeIN(O(o_IV0dNPAZH72Mef#m(p9n81 zK#d_FLLFTw-Vj3Ye~T{=;d|lh2MNS*z(}0p3=*VZ?uanK3f68a8YBXDC_n^$KoElo zT%b6rAORu}(104?gae4+KNrH#e*wtGLjFXSemJ9I81V}*7P6WO#BWnb0n%WYQ>=>! z3vQ)Cmal~4DqS&=iMmqaxSnXmg;WtEQe4Orv)D!3pyyW$e*sq$)u+YJ38##@>PHL~ z0t6NuXiarn%5d5^E;X7_JWC+dSq74pxFrfMa#2*Hd?>Ap_(cPXa%A1eII4aOgHUZS zR7QY6NTe7NQ&b?0ltgrzs11aA3t>-|Vw1gr{9%mX2m#!{5d@78A&taQWVQU_lcTu~ zQ}lDCaF9S1e-N~waJ1Bj4T?z>V2DX!!f8U`mOvFSSOJ<;0Yw;qDIR4IiVl~=2oR{i zwB|L=YmlRw)utCp09bF7EV>92as+^1UZffBa03ulp^75ZawAn}ToM-o3RwbxEw`)| z5OnE2r1xiyzz72lydz6skQ9fDv$rwP&$(A=aAPkM0Nvt^$Ls04OS5 zj|!}(f6CRWC{-y-U78Y@4x~~8xzs{w3WyzyHK+6N0b?a6rl1aWnZhw?Wl@pT#y(cB zgWq^{YcxdfTG})-RJHtV|J0KVUh5v8b3ue-vO#g|7}35Zdi(cTa0w>~?m#R>cA{ zK%{iwQM$9dtQ*@wY+9U>sr)mTL9p8TDrxS9RaFQ`hr)u1Xiy@)!UCr09FJu z@Jss!!bI8-QXLE!hyvjB6CMDAo```uV;G?fM6iJ}ra**3WIzo>umlTGM+A1b zWq}Cxa0E3E@B=vzp$GWDX^wYX4Sp;T$V6yE07@)l8q-1zX;3kXi9ms7w0OiNro#)^ zKm<^Dmq*P^7 B3`+n2 delta 1802 zcmV+l2le=_4y6u|6@P~f000CB000{}00903H2?s>-#G#UVH_N&5I{dg0|5w`0uc-Z zh!-&e0QBRc7>gO9VCnL2;KmX!YWyQZ0-_ggCx%?ClV(~>h^TO^5Hir0&5R{~0BHfS z07QlX1SAD8vnJ0W(pF6%;uNaX3TJ9E9dfm1KQ$1E1b`SIh$9DxQWy>d5d@0ZfdZnq z1t4Hb+JWYVFeC}!pHQMk$0ij3K#{i|e{#(^geZ~X$DbEBb~Jr4^p18g9ql(G*${{ZYFe-|Ez zU{DALA#~%9V1`g|2n#U;FQSRYTTQ_821*Ykk=XkIw)Y@H;+_Zsgb17^^4qV!|6=@U zz~TTn4uGQs8)(KG0hFc-IEWO&NF+IoX~-r$6b}IM$^%L@^-z4xJ=q2V;>8>f z2GWl|3Cr8@FXRpkGR!e0Tm%gzelZYk*_{1#`1#qBOoxMf0b2@fJGKt z!h&nWCI)7uWZZIX8e&#VY-(awPSSn%+<{1$7l3*PLSkK;s0BdWd}l>vUO)sMhzpy3 zvFYG}5*|o}S!J>5VT~dlh=y5jvFT!sG9E|@n_#i&}4n+*eu`p?DQ-c{1g!llI z4z~4~z#a|kG{~uk&;c73G+RL`t+`HCDvh9+3J|K{{?3$~ckbD|l7a?c=%Noi`l6(l z=8H=J#z`XTi^#r66D)240*(->=-NCWj)3R@&65k2?8z&qMr|TMe@|N~bClqM2(nRE z{d3A!PlM{xU$49$Z}1+7XP@~NnrOKK5F8@Hhl8kT06JNsfgIt%0UF!1sOEwo%u!|w z%OM)@56%a2AkzT^&=df75ZPvk>aQo?eDsO%q5^7$Kt!D`Vy8NUU%nus`RDr~L5%u` z5Q$Tq0e}J|py;Gxe?Zd_L4nz!01^1%zXjeef8wZu1c)F%`e}d@4j=;iIOsw41t1#` z0n}Lf;S7jG3L||121HC#f$xdWQ({w!vo5l%uDL2&#|qA^hNVLt4hx6i>LC#!GDM63 z5h6W2;u39B9%MnJTRX%a5*ZhqDGsY2F@OjVSP(WK-S9M9e*_m6sra2GK*UfUL(~rx z^_I9S%26$3;YIqQfko}HO;Ti4KZe1^HXQ0&aqQF_4@3nJO-V$jNey}$34rxzDK_wd z$RDBzju3PW96`_s5w19#JN|=|eesFSHg_QLX)-uSmRfSVFEs>vdtMKP+;f!wj9Dfwtf zM><29e*t0#XGO(4d~jC3jcKMe#bt0PdRSEKbfthrs@(eOR+%yY2aiow4Vd~<%t93i zm@VvND{EE0o>i+{Md4THY8SqIZLFQ^(q@67(!mP$u#&y(W8pfGjDmF_b?pmC2O`pe zkTjnrO_me77$dBYE7GqSh+cOu{=eEe{wAg1msE<3(RmRTMwF9egc4^;r(oP z9U9x8ZdbjfRZCY<3xGQskF{Z|AwSit5$B3_zu-kEQTs6o-U2`bBA7v6wl|Pe0>FDE z)zo0XPzU-2q5vxWga^Q|Ct_627)B@q5p1B0DG;F$8BhZeEWv`x5rG|UAc8#{5zGVp zTtE&)=m9=dI^!BwgCF_RF%jAjfDg0S#k5dE8c1wnB2b_iC+_fv>F@$J5CIezCISy? saN-ElF9r1YFe}(F1|l@0$3*xHL^9!CdBS(V^cAapOC=mLRxu;40yQ$`cK`qY