From 5395d29ac0d31a020863a12c82b43e9b72c52e54 Mon Sep 17 00:00:00 2001
From: Willem Toorop <willem@NLnetLabs.nl>
Date: Fri, 19 Apr 2013 21:53:19 +0000
Subject: [PATCH] Splint, put end of string at the end (and not end+1) and
 unbound-1.4.20 regression test

---
 test/32-unbound-1.4.18-regression.tpkg | Bin 1164 -> 0 bytes
 test/32-unbound-1.4.20-regression.tpkg | Bin 0 -> 1165 bytes
 util.c                                 |  16 ++++++++--------
 3 files changed, 8 insertions(+), 8 deletions(-)
 delete mode 100644 test/32-unbound-1.4.18-regression.tpkg
 create mode 100644 test/32-unbound-1.4.20-regression.tpkg

diff --git a/test/32-unbound-1.4.18-regression.tpkg b/test/32-unbound-1.4.18-regression.tpkg
deleted file mode 100644
index 3c0818afb6cfc5f5688ccca5ed6dea8597433551..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc-jL100001

literal 1164
zc-jGs1atcziwFSzgP~9W1MOGqQ{y%e=WFy=>~Wb(+o_*<wdwEy2-jl@Ifln|IuwYo
zl~{vgxssj0l>YBs$qwXFF6opTI=%Wg!M3E;?rOC!n!c4M*CJ0s%d=ay_njr#STd!!
zNbHbHXXE*BUANnA1HOIym2WeC0C>LJcAKu(?Q{X3e#_s0_Ggg27P-o(L{(-yj@jhX
zbnDj3b3DBNBWSL>|CIzm%xGe(Xtj)W_wRY${Qg~Y|9-pGZf=145(fC6-~a1Z&NWXQ
z6%isQV2vaUV+EE+@9~mTu%>W{9`G<|T>fg;8y^kz#E_7G`ydtm5uO+S8B^JM85j?p
zR_l}T?>F0>h5X;b_-}Pv-75ZH0_Pa>VB3zJr8i@HN~JxaDq|8Z;LRIQB9{SsYMl^v
zn+lo1(e~-Pt-5~poLosqVLIuRPd$!BKx1cVXqIh4Uc-n>l>wDw;0m&c!FA5#5YY3;
z>CsO=UhSOiAN05C9(lKSytg$>XW?)z`JjJwu)lM>ef-N+p~T|`$By~6B4>l0_h*BC
z$;64oggN>gj*@{>dbJ}N7BR(2?<NQR!O7K!z2lSp_k*ornH*t}cS?gBI_AmPiNi!$
zfk;Mt43;%zQU}G*D8497^UxoJ@Db>cfmdLKQ2$6hf`?B?jRlc_&4I{(-LfFhPz*c<
zoY}pJRJS|>myGxlOZ^qnjF!wsLIMMx!0@YJS>6wz^L$*S^2X))Wq4uRx5ck<PiHsK
z_&t?8$)NuIAC0evq!tQNs|A?%(<N3;9bH7PCyW>ZxlAzEOOriGVD772U0OP%H*CaX
zBVuxcjsYC~k7hzXMLl0LA6F6Tuk7G)hql;)C!z7`dN_9mup+pJqPqPCo1iZk>WeP%
z?dF1Qvq#$+F7sm+w)Nl}6EzFf(mi**&c&lOjaz|ry|f=JTFhuCfO<B!tyXv44tYOU
zzcHd{wy*~-G)S$`y7aH@IEML=H46nQ511O|aeN0eo<&cbd{gf({I14g#U7ZQprbEw
zD<rStwEi4uVonM{g`BfeM94!(FhIh)gibi76Vy2tGz3gmPfF8#wBlaXr2GZXtN)=2
z{)UV-_1|q_%{TSm?=(Fm!1~{Ax>fyu3G86$8_)^s!K#ZUABx)61J8CzpQ%9dG&2*Y
zy7<haKM<4DL_Qr;p5Q_%*_4Z16>(|uK^9@9FKZ>)m5gdWeVU;PhgjhTVv5cHzTflw
zUb6+ed#B*Lo=*;uV}^fB_TXo88E`6u6e-!o&0`_&dO&tj0Zf%i)<Z2*mV^o?k0jGi
zp>S5KyZWrAsU_R_?OQyF*-n+hG)mrLQp=Im7nMbx7yl89)Acge#Xq+F%kkgowyXGm
z37p&|B2^syT(>Hq>#y$iZO618tK&qsv`C-QEb5u3?%`(<lgxDT<v$NGpE5;g(cPO?
z6{(8m783<FP*|D8EWr-sS{2<LXj_wn;c}@9?zj^<<ca~sb~whIF=a;N7Zr>ZDpaUY
ep+bcU6)IGyP@zJF3Kc4RX8Z})Z3e^uC;$M8QBA1;

diff --git a/test/32-unbound-1.4.20-regression.tpkg b/test/32-unbound-1.4.20-regression.tpkg
new file mode 100644
index 0000000000000000000000000000000000000000..b56399348fa624879f01561e0e46a9330e9f2ca3
GIT binary patch
literal 1165
zc-jGt1akWyiwFQxym3(g1MOJrPvb@q=WF(_nB$^LTh*^P58;XrK%j@p<q(gnDhgy{
zZ{ih>?e5wMsPupD?An14aY-fauDz>&3byw(GdnvoJA>Oa@_3l!abP%R%WT?)U}M3g
z<VkD>Tv!_~hi%*4b{p{B#9#T=?FWF<bljHfcI=i5w$p98&IYtU0q?cQWkv;xGUHLi
zCLf=-ZoJ&b!}}|NyYBo~PRN+d*7HDpbXu*Co`2JAcb=Yqv(<H*8(@F_?f>u3{{oB=
zn5JcB>CM=jQejT0%$R^nc=HBik_(?bH%<t<O%sv9@y^-X?Yeq;RxX7lhdlPmr)o!u
zPa|uosfSHMUc-nBnE@4J;1aTs!7%4h0BCvS?D&_TuXoQ6k9ym6hrHcC+20<dvtTgi
zeAK%>I@~?kIr;6n5aMxxWk!4`$$5YG{dvDv60yQ$!Ys89OA6mAt=bYSVpOuyy2(+m
ze|r64|K#-WeSdqP1h-@ei?mbf-_S9S$5s@?((sdb#K&M5Qzn#C47A{j+!PJ<K?om#
zav699Mga9E;t||@Olr&z6WHu08L(UC=NYnrM~Bm^H*wZ2&%h=lzC==e1vH~2u~8y`
z0gqwuoxjZQCx|2%(LIt*p>cI_6<nI;ZSiZ|)7cF){!9grGpKL<)%bouYC%G3H9rL-
zT_R=G(L~gE%!r;KmM6^RQq!KDpwFuuT^f2vZ`g=On#JS>4FfpZAI%c+-0b<7{<scN
zerfuTE0o3-ED4oYSIxOGfDytyXq6a$z$T~zhWesO{J6QG+w4)dn#z2eg>D`AL3>T1
zVq=P0wl8d_bNQ%EZB}3mm)3(piymbJP|xPNRpPE&A@1kmH%1iI7I<JogVYMCOZ(c1
zBA9Pkk&qyBpUF`kMRzdcS@_J(H`VIG?rJQO?19)R8u}8og7Yd$>-T{w=A>X$@HsD8
z1U!Hk9VEDm>4alAL7Ah327tlpS#FAs65JvGcC`KP;br%~kD)U*Ww@Hhn)}~&9A|$2
zx4T^%@Beno?N;~ym%!^+<rPPWm|!j-V4!0ceTZ6DXaNf$?02)?c+ylI15&xx*NK<;
ze<1yTz+;{Nw>s@5|8KQb{a5+_=f^IlzI{4j9;`ZO@}bCWJ#b8$^qBMoPcz+drjpP3
z?e8a(RNwq`OnHn0sbEu{<g&Pzbv}@VnCX|fGT9T1Dmp!yp$G?p!%ix|*@C9)wYEI8
zn!WwgGich5OWq;L4F8z$;8%SbaF!$@Ny#3r9w*|?1G0w_V6GHr9*UW=IFQ(RESP#G
z5_^@rt2e8wTC$Vh9^h8=aw;X}QRD!#njA@eOR?@{{vWa^UC(2k|GW0`{om?z+m-)+
z37p==Nh&#-xhhpa<=?8>H!WRytacMs(&GG-W}&B_s)nD1OfX%^m;XG7_>@UPi|SsN
zsyM4CZZS|`0fm`)GK;YS8Oox%1Ep&cGaN2u!4-E&4!LANu^f&tW=xr8`7QZkg$fla
fRH#s)LWK$yDpaUYp+bcUpBjGy&q_<^04M+e**{Xj

literal 0
Hc-jL100001

diff --git a/util.c b/util.c
index 435cc344..33060d96 100644
--- a/util.c
+++ b/util.c
@@ -506,7 +506,7 @@ ldns_b32_ntop_base(const uint8_t* src, size_t src_sz,
 		return -1;
 
 	/* We know the size; terminate the string */
-	dst[ret_sz + 1] = '\0';
+	dst[ret_sz] = '\0';
 
 	/* First process all chunks of five */
 	while (src_sz >= 5) {
@@ -575,7 +575,7 @@ ldns_b32_ntop_base(const uint8_t* src, size_t src_sz,
 			case 4: dst[7] = '=';
 		}
 	}
-	return ret_sz;
+	return (int)ret_sz;
 }
 
 int 
@@ -634,20 +634,20 @@ ldns_b32_pton_base(const char* src, size_t src_sz,
 			else if (extended_hex)
 
 				if (ch >= '0' && ch <= '9')
-					buf[i] = ch - '0';
+					buf[i] = (uint8_t)ch - '0';
 				else if (ch >= 'a' && ch <= 'v')
-					buf[i] = ch - 'a' + 10;
+					buf[i] = (uint8_t)ch - 'a' + 10;
 				else if (ch >= 'A' && ch <= 'V')
-					buf[i] = ch - 'A' + 10;
+					buf[i] = (uint8_t)ch - 'A' + 10;
 				else
 					return -1;
 
 			else if (ch >= 'a' && ch <= 'z')
-				buf[i] = ch - 'a';
+				buf[i] = (uint8_t)ch - 'a';
 			else if (ch >= 'A' && ch <= 'Z')
-				buf[i] = ch - 'A';
+				buf[i] = (uint8_t)ch - 'A';
 			else if (ch >= '2' && ch <= '7')
-				buf[i] = ch - '2' + 26;
+				buf[i] = (uint8_t)ch - '2' + 26;
 			else
 				return -1;
 		}
-- 
2.47.3