public inbox for cygwin-cvs@sourceware.org
help / color / mirror / Atom feed
* [newlib-cygwin] Cygwin: console: Fix an issue which causes when realloc() fails.
@ 2022-07-09  5:59 Takashi Yano
  0 siblings, 0 replies; only message in thread
From: Takashi Yano @ 2022-07-09  5:59 UTC (permalink / raw)
  To: cygwin-cvs

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;
 		    }


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2022-07-09  5:59 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-07-09  5:59 [newlib-cygwin] Cygwin: console: Fix an issue which causes when realloc() fails Takashi Yano

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).