public inbox for cygwin-cvs@sourceware.org
help / color / mirror / Atom feed
From: Takashi Yano <tyan0@sourceware.org>
To: cygwin-cvs@sourceware.org
Subject: [newlib-cygwin] Cygwin: console: Fix an issue which causes when realloc() fails.
Date: Sat, 9 Jul 2022 05:59:05 +0000 (GMT) [thread overview]
Message-ID: <20220709055905.E1E7E3858430@sourceware.org> (raw)
https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=421dcf72fb02bda019e311dbe18a41b9bc9cd56b
commit 421dcf72fb02bda019e311dbe18a41b9bc9cd56b
Author: Takashi Yano <takashi.yano@nifty.ne.jp>
Date: Sat Jul 9 14:16:11 2022 +0900
Cygwin: console: Fix an issue which causes when realloc() fails.
Diff:
---
winsup/cygwin/fhandler_console.cc | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/winsup/cygwin/fhandler_console.cc b/winsup/cygwin/fhandler_console.cc
index 47d30bc88..c542fa46e 100644
--- a/winsup/cygwin/fhandler_console.cc
+++ b/winsup/cygwin/fhandler_console.cc
@@ -296,7 +296,11 @@ fhandler_console::cons_master_thread (handle_set_t *p, tty *ttyp)
(INPUT_RECORD *) malloc (inrec_size * sizeof (INPUT_RECORD));
if (!input_rec || !input_tmp)
- return; /* Cannot continue */
+ { /* Cannot continue */
+ free (input_rec);
+ free (input_tmp);
+ return;
+ }
DWORD inrec_size1 =
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;
INPUT_RECORD *new_input_rec = (INPUT_RECORD *)
realloc (input_rec, m::bytes (new_inrec_size));
+ if (new_input_rec)
+ input_rec = new_input_rec;
INPUT_RECORD *new_input_tmp = (INPUT_RECORD *)
realloc (input_tmp, m::bytes (new_inrec_size));
+ if (new_input_tmp)
+ input_tmp = new_input_tmp;
if (new_input_rec && new_input_tmp)
{
inrec_size = new_inrec_size;
- input_rec = new_input_rec;
- input_tmp = new_input_tmp;
if (!wincap.cons_need_small_input_record_buf ())
inrec_size1 = inrec_size;
}
@@ -478,13 +484,15 @@ remove_record:
DWORD new_inrec_size = n + additional_space;
INPUT_RECORD *new_input_rec = (INPUT_RECORD *)
realloc (input_rec, m::bytes (new_inrec_size));
+ if (new_input_rec)
+ input_rec = new_input_rec;
INPUT_RECORD *new_input_tmp = (INPUT_RECORD *)
realloc (input_tmp, m::bytes (new_inrec_size));
+ if (new_input_tmp)
+ input_tmp = new_input_tmp;
if (new_input_rec && new_input_tmp)
{
inrec_size = new_inrec_size;
- input_rec = new_input_rec;
- input_tmp = new_input_tmp;
if (!wincap.cons_need_small_input_record_buf ())
inrec_size1 = inrec_size;
}
reply other threads:[~2022-07-09 5:59 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220709055905.E1E7E3858430@sourceware.org \
--to=tyan0@sourceware.org \
--cc=cygwin-cvs@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).