public inbox for cygwin-cvs@sourceware.org
help / color / mirror / Atom feed
From: Corinna Vinschen <corinna@sourceware.org>
To: cygwin-cvs@sourceware.org
Subject: [newlib-cygwin] Cygwin: console: Prevent buffer overrun.
Date: Mon, 02 Mar 2020 19:26:00 -0000 [thread overview]
Message-ID: <20200302192643.27464.qmail@sourceware.org> (raw)
https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=750cd6e5b2bb4ab74de7d2f9e0afb6dd0c005cf1
commit 750cd6e5b2bb4ab74de7d2f9e0afb6dd0c005cf1
Author: Takashi Yano <takashi.yano@nifty.ne.jp>
Date: Mon Mar 2 10:12:56 2020 +0900
Cygwin: console: Prevent buffer overrun.
- This patch prevent potential buffer overrun in the code handling
escape sequences.
Diff:
---
winsup/cygwin/fhandler_console.cc | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/winsup/cygwin/fhandler_console.cc b/winsup/cygwin/fhandler_console.cc
index 9c5b801..8b46877 100644
--- a/winsup/cygwin/fhandler_console.cc
+++ b/winsup/cygwin/fhandler_console.cc
@@ -3094,7 +3094,8 @@ fhandler_console::write (const void *vsrc, size_t len)
case gotarg1:
if (isdigit (*src))
{
- con.args[con.nargs] = con.args[con.nargs] * 10 + *src - '0';
+ if (con.nargs < MAXARGS)
+ con.args[con.nargs] = con.args[con.nargs] * 10 + *src - '0';
wpbuf_put (*src);
src++;
}
@@ -3102,9 +3103,8 @@ fhandler_console::write (const void *vsrc, size_t len)
{
wpbuf_put (*src);
src++;
- con.nargs++;
- if (con.nargs > MAXARGS)
- con.nargs--;
+ if (con.nargs < MAXARGS)
+ con.nargs++;
}
else if (*src == ' ')
{
@@ -3117,9 +3117,8 @@ fhandler_console::write (const void *vsrc, size_t len)
con.state = gotcommand;
break;
case gotcommand:
- con.nargs ++;
- if (con.nargs > MAXARGS)
- con.nargs--;
+ if (con.nargs < MAXARGS)
+ con.nargs++;
char_command (*src++);
con.state = normal;
wpixput = 0;
@@ -3183,9 +3182,8 @@ fhandler_console::write (const void *vsrc, size_t len)
{
con.state = gotarg1;
wpbuf_put (*src);
- con.nargs++;
- if (con.nargs > MAXARGS)
- con.nargs--;
+ if (con.nargs < MAXARGS)
+ con.nargs++;
src++;
}
else if (isalpha (*src))
reply other threads:[~2020-03-02 19:26 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=20200302192643.27464.qmail@sourceware.org \
--to=corinna@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).