This is the mail archive of the libc-alpha@sourceware.org mailing list for the glibc project.

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]

Re: [PATCH] vfscanf: Avoid multiple reads of multi-byte character width

From: Florian Weimer <fweimer at redhat dot com>
To: Andreas Schwab <schwab at linux-m68k dot org>
Cc: libc-alpha at sourceware dot org
Date: Fri, 2 Sep 2016 16:15:27 +0200
Subject: Re: [PATCH] vfscanf: Avoid multiple reads of multi-byte character width
Authentication-results: sourceware.org; auth=none
References: <20160902131953.69ABB40191DBC@oldenburg.str.redhat.com> <87fupixv5q.fsf@linux-m68k.org>

On 09/02/2016 03:56 PM, Andreas Schwab wrote:

On Sep 02 2016, fweimer@redhat.com (Florian Weimer) wrote:

diff --git a/stdio-common/vfscanf.c b/stdio-common/vfscanf.c
index 8cd5955..2b7093e 100644
--- a/stdio-common/vfscanf.c
+++ b/stdio-common/vfscanf.c
@@ -757,7 +757,7 @@ _IO_vfscanf_internal (_IO_FILE *s, const char *format, _IO_va_list argptr,
 		  size_t n;

 		  if (!(flags & SUPPRESS) && (flags & POSIX_MALLOC)
-		      && str + MB_CUR_MAX >= *strptr + strsize)
+		      && MB_LEN_MAX >= *strptr + strsize - str)


Please reorder the condition to put the constant part on the right hand
side (also below).


Thanks, committed with that change.

Florian

References:
- [PATCH] vfscanf: Avoid multiple reads of multi-byte character width
  - From: Florian Weimer
- Re: [PATCH] vfscanf: Avoid multiple reads of multi-byte character width
  - From: Andreas Schwab

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]