Re: lib/53597

[Horimoto Yasuhiro <horimoto%clear-code.com@localhost>]

The following reply was made to PR lib/53597; it has been noted by GNATS.

From: Horimoto Yasuhiro <horimoto%clear-code.com@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc: 
Subject: Re: lib/53597
Date: Wed, 12 Sep 2018 19:02:26 +0900

 I send better patch.
 
 >Fix:
 
 --- history.c	2018-05-26 03:09:38.000000000 +0900
 +++ history.c	2018-09-12 18:44:00.433209910 +0900
 @@ -778,6 +778,7 @@
  	char *ptr;
  	int i = -1;
  	TYPE(HistEvent) ev;
 +	Char *decode_result;
  #ifndef NARROWCHAR
  	static ct_buffer_t conv;
  #endif
 @@ -810,7 +811,10 @@
  			ptr = nptr;
  		}
  		(void) strunvis(ptr, line);
 -		if (HENTER(h, &ev, ct_decode_string(ptr, &conv)) == -1) {
 +		decode_result = ct_decode_string(ptr, &conv);
 +		if (decode_result == NULL)
 +			continue;
 +		if (HENTER(h, &ev, decode_result) == -1) {
  			i = -1;
  			goto oomem;
  		}