tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream commit 

fix NULL pointer dereference crash on invalid timestamp

found using Michal Zalewski's afl fuzzer
This commit is contained in:
djm@openbsd.org 2014-11-21 01:00:38 +00:00 committed by Damien Miller
parent a1f8110cd5
commit b6de5ac9ed
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
krl.c
View File

@ -14,7 +14,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $OpenBSD: krl.c,v 1.18 2014/11/17 00:21:40 djm Exp $ */ /* $OpenBSD: krl.c,v 1.19 2014/11/21 01:00:38 djm Exp $ */
#include "includes.h" #include "includes.h"
@ -747,8 +747,12 @@ format_timestamp(u_int64_t timestamp, char *ts, size_t nts)
t = timestamp; t = timestamp;
tm = localtime(&t); tm = localtime(&t);
*ts = '\0'; if (tm == NULL)
strftime(ts, nts, "%Y%m%dT%H%M%S", tm); strlcpy(ts, "<INVALID>", sizeof(nts));
else {
*ts = '\0';
strftime(ts, nts, "%Y%m%dT%H%M%S", tm);
}
} }
static int static int