[newlib-cygwin] Cygwin: console: convert wpbuf_put to inline function

Corinna Vinschen corinna@sourceware.org
Mon Mar 2 19:52:00 GMT 2020


https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=ecf27dd2e0ed1dff4dc919a7c805e951913d953f

commit ecf27dd2e0ed1dff4dc919a7c805e951913d953f
Author: Corinna Vinschen <corinna@vinschen.de>
Date:   Mon Mar 2 20:30:09 2020 +0100

    Cygwin: console: convert wpbuf_put to inline function
    
    fix potential buffer overrun while at it
    
    Signed-off-by: Corinna Vinschen <corinna@vinschen.de>

Diff:
---
 winsup/cygwin/fhandler_console.cc | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/winsup/cygwin/fhandler_console.cc b/winsup/cygwin/fhandler_console.cc
index dffee24..c5f2691 100644
--- a/winsup/cygwin/fhandler_console.cc
+++ b/winsup/cygwin/fhandler_console.cc
@@ -63,10 +63,13 @@ static struct fhandler_base::rabuf_t con_ra;
 static unsigned char wpbuf[WPBUF_LEN];
 static int wpixput;
 static unsigned char last_char;
-#define wpbuf_put(x) \
-  wpbuf[wpixput++] = x; \
-  if (wpixput > WPBUF_LEN) \
-    wpixput--;
+
+static inline void
+wpbuf_put (unsigned char x)
+{
+  if (wpixput < WPBUF_LEN)
+    wpbuf[wpixput++] = x;
+}
 
 static void
 beep ()



More information about the Cygwin-cvs mailing list