From 8eb62dfcc402db40945ec130595be58ad08ee400 Mon Sep 17 00:00:00 2001
From: Ruthenic <mdrakea3@tutanota.com>
Date: Fri, 6 May 2022 17:26:01 -0400
Subject: [PATCH] fix OOB memory in lib/log.h

---
 bin/httpsrv | Bin 21864 -> 21864 bytes
 lib/log.h   |   8 ++++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/httpsrv b/bin/httpsrv
index ff7a87b77b6bfae87cc79316c53d911e248c0613..4e857f4685de15eb78a193728b62ca47be834655 100755
GIT binary patch
delta 1737
zcmaJ?eQZ-z6z_dqp(U<tW!>x7*4LuA2^MAw7(ZF|^%lRfh!LY>5`ys`H!&NCb1pES
z$+K1+hiM3!2`P-s7#ABRLX-`XHU5E&#OQQ{O$7F!B8AB|rt^C4ePyo_<t6QT_ji8h
zch0%zzW20lqIHuVE3wTuO#GUO=aS7rURi$l!GYEF^`p~IjJ|TM2rhb0?Tmk9{@xr2
zi8`^A==L-khskbgaHa8h``qq%WPAJp$CFvMwmu@O39WY;PKtr~J#Lc;mj@YBTl6Oo
zSGn-~H1vD&$%_yWn}zROur5C@*gHk3tR9miij}gvgcf568Isd_O)w}1?JVW2+_~+p
z3c-J!i`@xpUClzL$ix;lP2McFo*{-<c#0Rt8k<#%P4VJRPcl8>`~=jwUK1MfxnOwW
zX2Bps48idUE_lhAA-H~$36hVY&m)q(FyvW9&Vt)pC~mk$=?kiI^k<ZaD6cYu{T_kG
zy|)+7LtUkBODNLOnCTvnqZUi1ct7m&dW%0mrT<|M=Vg@A0wZ3@emoO84%t5U3MQZ`
z@32%+We`oIgDun_SVa!DX*!Hk$oVFOGi3Nyc+Tf0kHIG2VzLJI_{zy981pT*UtExp
z@(@S`&eq9HXy`hn3FS@HX9o#85_v&N4<Z+Ah~aL$kN0xaY2_YXMQoh)*t7uoQ(R5w
zA7T=-e2sfJztQ0TSep^>_P+uKjDT`IAO{m1F!;$@L;XvGEE?p!kXu;b{E++72YiH`
z*{G!m$_noypF@42c>lAy<bLccxkOX1;1-*dzBdAGU$c!68eIwH6TJC@wI8*tG}u}#
z^c5BtiJAKQrkQ>R3&6pohSBJwniz*%zo#;kiz+vsw%ApjHNsd4&55aH^{5;@kU}KF
zhyE4ri3xqxtSpY;;&s^Qcjb?#DE;=>Q?hzaZu?D=)fNrQtA|d%mk4m!zs%jNm%0ic
z*MxE}{?8Qf7G8oZX$h%-5@``x2x}yX%z-UZo%K_E-JtqsFe>f#9R3}Pi6}CL;j}OF
zvibD3!LES+j(ae<;ofh!t1qVyL&Oq-k$}6k#qhaxpGS^Z{>G!qdhSI?<;7jtrjI|J
z@ew2J43>iDYXgQQ(qVptlB*Hu<$%I^Ojh7}Uz)J?hVI=o8AANMG(L6-i3M1>#2Sn6
z8m|6D=@GWiS~bLiE6ASsaL}3k#j;c8;&*?g^idrAiL;cxj5g;yr905pj8S?JElpB7
zgti1M;S;U=^;>Gsc}pnEo+G!J&0%ueT&u|>q4p^L?mI*2tvFez^fYF?6{iR}jabcp
zaO^yp4->JH+hN^uKk>s>{4a^`UfyaYsd(U_E{l8itAH$awWD<i^G&JvFJ%paZT4dV
z&s084PQuR0F4765RZGbg*jQC(V;>B5mBLR|n@MTBMqX(ngP_(dwWWf(D;4jr=`#NV
D5|8U@

delta 1728
zcmaJ?ZA@EL818B5XpJkZqb>cuC2p*20*MY6Cs<^I`@_VLu^(i?Wr-gon_qDgbpm1R
zl3ebp;wzdZCQ4!~VNuC07{nlKi!^gThQ>@bGi5s6#fl)JwCHkt&$%6~i|!`vd+zf-
z@AH0~bMMs#h&Dh5EyOx!H}GptT}N7s1<!pjJ^xb5`R2v32HW<Hv*R@{zagk^nZ7cG
zN?bazlIZqZG<Ji{@OWVwS9@{?ZX-w3`|P`N%yL{CU4cEGP~MQ+U=Zc_2xDm_e}UrJ
zVSHo-zVJAW2U5`Qevy0$eJ)3EG)bu_pAi+wLfI;=^)rM_vt?_FYqemmRjs)c*D6kN
zt+FK3GR9o6&sh*`UA|dtKSOk}NRo@)iw&)c4JNtR&&y1VEJDnE*m&5<wIYAstX0Yo
zUCXr0v~1TMSz6CRw`V7LAErDmG7Oq0LY5%x4Y&^dLFr?%bovrTE7J4KU~A{$VecJb
z4@ycCFO(|12eaLiV$|%&);<d-yx#D8sPsSVL_t<163lxA+vRNNGWdP&3ML>+$5^VU
zG=)a#WjFE#R#6cfl@5!Y6ZxN(;?6O=2M+k$qzSrwn@KaA^z9&Bu<YAxTUno#@^dKn
zJKA%zQ(jF`8kdfuK07+tQ8D*QgNV#p5yNS`ifb|IDC8bq#nA7p$3yFpZ^`11GKp1w
zlBeeUqZ$6SCJyTfy8jh$ArsJ`2jpXd&ocZ(Q${_WAs1)J!w?Gi9Wm}pAL|4=sZsMb
z*cB)t<IomxZQrj;_G4d(E!y$laKr{_qAk=p#s*<LSQwYy!Nn45KWeVau(c;(DiGdO
zoUK2w!t{Gt0B+2}H)!;&TC)V9pr^KK9je@T#)cMk)_05**EV2kQ9dn3hZhi0_@;l1
zGclmAk(I>}yg3FP!9u4Ap|fXpi}H_R=P!aNw`y2k8+;h_5<8p=mb(?b)CfMLacLX=
zU-$DCTA@JLLUu#7u#wya&4NIjAPajfpWq7y)yH5#=<}TW6^l_M5yNn|DKDGv-fM6o
z6x{H@LbiJ(<8GW!9|px-1@j?ydo<$<>pqXDm~CZz4%#F_GB0lSh`#;ljC(R+i&zSt
zuSYTLYdqm>RAmSy8W5P|fW&%C?8N(z(u5~(=-x>arHH?s#+T=i=*Pwc)|kS@7XPMn
zoXuHlgrTAea#BqcIo3j?+O8VQFPXyKKT!H0?tc6#rB9>H`H9lk(N<rhbOh~ug3@WU
zAu!*4zMa2yt8MvR#+tQj#7>i`oZOykF&G3)FoVB}?<u_%CkK@t!i=}#Y(h>mR`VYm
z8&BrLM6Bcv*ta!E@}L9%Lu%jFb_<zNLsc=ed-Y?0EOzyvwHxycGwPL^r;OIsZwNHj
z-cL@!@!A-91*+@H$Q5{|Zm;!S{8q555-!%YkV>^)yvIr=K&~&d&J^jc8TC|s%=8aR
Cd+M10

diff --git a/lib/log.h b/lib/log.h
index e992a98..1bbc3b3 100644
--- a/lib/log.h
+++ b/lib/log.h
@@ -7,7 +7,7 @@
 
 void info(char* ustr, ...) {
 	char* tstr = GRN "INFO: " CRESET;
-	char* str = malloc(strlen(tstr) + strlen(ustr));
+	char* str = malloc(strlen(tstr) + strlen(ustr) + 1);
 	sprintf(str, "%s%s", tstr, ustr);
 	//strcat(str, ustr);
 	
@@ -18,7 +18,7 @@ void info(char* ustr, ...) {
 
 void warn(char* ustr, ...) {
 	char* tstr = YEL "WARN: " CRESET;
-	char* str = malloc(strlen(tstr) + strlen(ustr));
+	char* str = malloc(strlen(tstr) + strlen(ustr) + 1);
 	sprintf(str, "%s%s", tstr, ustr);
 	
 	va_list lst;
@@ -28,7 +28,7 @@ void warn(char* ustr, ...) {
 
 void error(char* ustr, ...) {
 	char* tstr = RED "ERR: " CRESET;
-	char* str = malloc(strlen(tstr) + strlen(ustr));
+	char* str = malloc(strlen(tstr) + strlen(ustr) + 1);
 	sprintf(str, "%s%s", tstr, ustr);
 	
 	va_list lst;
@@ -38,7 +38,7 @@ void error(char* ustr, ...) {
 
 void reqlog(char* ustr, ...) {
 	char* tstr = WHT "REQ: " CRESET;
-	char* str = malloc(strlen(tstr) + strlen(ustr));
+	char* str = malloc(strlen(tstr) + strlen(ustr) + 1);
 	sprintf(str, "%s%s", tstr, ustr);
 	
 	va_list lst;