Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PR/53597: Yasuhiro Horimoto: Avoid segmentation fault in bad history file.

This commit is contained in:
christos 2018-09-12 22:10:35 +00:00
parent cf2901fc1a
commit 6da79ee096
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/libedit/history.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: history.c,v 1.59 2017/12/23 18:25:03 uwe Exp $ */
/* $NetBSD: history.c,v 1.60 2018/09/12 22:10:35 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)history.c 8.1 (Berkeley) 6/4/93";
#else
__RCSID("$NetBSD: history.c,v 1.59 2017/12/23 18:25:03 uwe Exp $");
__RCSID("$NetBSD: history.c,v 1.60 2018/09/12 22:10:35 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
@ -775,6 +775,7 @@ history_load(TYPE(History) *h, const char *fname)
char *ptr;
int i = -1;
TYPE(HistEvent) ev;
Char *decode_result;
#ifndef NARROWCHAR
static ct_buffer_t conv;
#endif
@ -807,6 +808,9 @@ history_load(TYPE(History) *h, const char *fname)
ptr = nptr;
}
(void) strunvis(ptr, line);
decode_result = ct_decode_string(ptr, &conv);
if (decode_result == NULL)
continue;
if (HENTER(h, &ev, ct_decode_string(ptr, &conv)) == -1) {
i = -1;
goto oomem;