libs/newlib-cygwin
libs
/
newlib-cygwin
mirror of git://sourceware.org/git/newlib-cygwin.git
4
0
Fork 0
Code Issues Projects Releases Wiki Activity

Cygwin: console: Fix an issue which causes when realloc() fails.

This commit is contained in:
Takashi Yano 2022-07-09 14:16:11 +09:00
parent 282d57d2a8
commit 421dcf72fb
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
winsup/cygwin/fhandler_console.cc
View File

@ -296,7 +296,11 @@ fhandler_console::cons_master_thread (handle_set_t *p, tty *ttyp)
(INPUT_RECORD *) malloc (inrec_size * sizeof (INPUT_RECORD)); (INPUT_RECORD *) malloc (inrec_size * sizeof (INPUT_RECORD));
if (!input_rec || !input_tmp) if (!input_rec || !input_tmp)
return; /* Cannot continue */ { /* Cannot continue */
free (input_rec);
free (input_tmp);
return;
}
DWORD inrec_size1 = DWORD inrec_size1 =
wincap.cons_need_small_input_record_buf () ? INREC_SIZE : inrec_size; wincap.cons_need_small_input_record_buf () ? INREC_SIZE : inrec_size;
@ -343,13 +347,15 @@ fhandler_console::cons_master_thread (handle_set_t *p, tty *ttyp)
DWORD new_inrec_size = total_read + additional_space; DWORD new_inrec_size = total_read + additional_space;
INPUT_RECORD *new_input_rec = (INPUT_RECORD *) INPUT_RECORD *new_input_rec = (INPUT_RECORD *)
realloc (input_rec, m::bytes (new_inrec_size)); realloc (input_rec, m::bytes (new_inrec_size));
if (new_input_rec)
input_rec = new_input_rec;
INPUT_RECORD *new_input_tmp = (INPUT_RECORD *) INPUT_RECORD *new_input_tmp = (INPUT_RECORD *)
realloc (input_tmp, m::bytes (new_inrec_size)); realloc (input_tmp, m::bytes (new_inrec_size));
if (new_input_tmp)
input_tmp = new_input_tmp;
if (new_input_rec && new_input_tmp) if (new_input_rec && new_input_tmp)
{ {
inrec_size = new_inrec_size; inrec_size = new_inrec_size;
input_rec = new_input_rec;
input_tmp = new_input_tmp;
if (!wincap.cons_need_small_input_record_buf ()) if (!wincap.cons_need_small_input_record_buf ())
inrec_size1 = inrec_size; inrec_size1 = inrec_size;
} }
@ -478,13 +484,15 @@ remove_record:
DWORD new_inrec_size = n + additional_space; DWORD new_inrec_size = n + additional_space;
INPUT_RECORD *new_input_rec = (INPUT_RECORD *) INPUT_RECORD *new_input_rec = (INPUT_RECORD *)
realloc (input_rec, m::bytes (new_inrec_size)); realloc (input_rec, m::bytes (new_inrec_size));
if (new_input_rec)
input_rec = new_input_rec;
INPUT_RECORD *new_input_tmp = (INPUT_RECORD *) INPUT_RECORD *new_input_tmp = (INPUT_RECORD *)
realloc (input_tmp, m::bytes (new_inrec_size)); realloc (input_tmp, m::bytes (new_inrec_size));
if (new_input_tmp)
input_tmp = new_input_tmp;
if (new_input_rec && new_input_tmp) if (new_input_rec && new_input_tmp)
{ {
inrec_size = new_inrec_size; inrec_size = new_inrec_size;
input_rec = new_input_rec;
input_tmp = new_input_tmp;
if (!wincap.cons_need_small_input_record_buf ()) if (!wincap.cons_need_small_input_record_buf ())
inrec_size1 = inrec_size; inrec_size1 = inrec_size;
} }