summary refs log tree commit diff
path: root/wcsmbs
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-02-23 23:30:12 +0000
committerUlrich Drepper <drepper@redhat.com>2004-02-23 23:30:12 +0000
commit16edf13b226dbe5f4f39794cfa363904af2c7973 (patch)
treeab38d57dd3ddfeaae672f0253a2bbdfb759ee96f /wcsmbs
parent5605e1177d4728b66b92cb5012810b5feda1ec4b (diff)
downloadglibc-16edf13b226dbe5f4f39794cfa363904af2c7973.tar.gz
glibc-16edf13b226dbe5f4f39794cfa363904af2c7973.tar.xz
glibc-16edf13b226dbe5f4f39794cfa363904af2c7973.zip
Update.
	* wcsmbs/mbrtowc.c (__mbrtowc): Cap s + n at the end of address space.
	* stdlib/Makefile (tests): Add testmb2.
	(testmb2-ENV): New.
	* stdlib/testmb2.c: New test.

2004-02-23  Jakub Jelinek  <jakub@redhat.com>
Diffstat (limited to 'wcsmbs')
-rw-r--r--wcsmbs/mbrtowc.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/wcsmbs/mbrtowc.c b/wcsmbs/mbrtowc.c
index de79e10e5d..6932b047ae 100644
--- a/wcsmbs/mbrtowc.c
+++ b/wcsmbs/mbrtowc.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 1996,1997,1998,1999,2000,2002 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 1998, 1999, 2000, 2002, 2004
+   Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@gnu.org>, 1996.
 
@@ -40,7 +41,7 @@ __mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
   int status;
   size_t result;
   size_t dummy;
-  const unsigned char *inbuf;
+  const unsigned char *inbuf, *endbuf;
   char *outbuf = (char *) (pwc ?: buf);
   const struct gconv_fcts *fcts;
 
@@ -69,8 +70,11 @@ __mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
 
   /* Do a normal conversion.  */
   inbuf = (const unsigned char *) s;
+  endbuf = inbuf + n;
+  if (__builtin_expect (endbuf < inbuf, 0))
+    endbuf = (const unsigned char *) ~(uintptr_t) 0;
   status = DL_CALL_FCT (fcts->towc->__fct,
-			(fcts->towc, &data, &inbuf, inbuf + n,
+			(fcts->towc, &data, &inbuf, endbuf,
 			 NULL, &dummy, 0, 1));
 
   /* There must not be any problems with the conversion but illegal input