diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2006-01-10 00:25:07 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2006-01-10 00:25:07 +0000 |
| commit | bc795d0b3065b9d03fcbf200ae889047350323df (patch) | |
| tree | b508e2df5a57bb0c0e58e78db43ecebf2eb96fc3 /sysdeps/x86_64 | |
| parent | 71ea167b1d3b01e78378b4863d87b5affb5def5f (diff) | |
| download | glibc-bc795d0b3065b9d03fcbf200ae889047350323df.tar glibc-bc795d0b3065b9d03fcbf200ae889047350323df.tar.gz glibc-bc795d0b3065b9d03fcbf200ae889047350323df.tar.bz2 glibc-bc795d0b3065b9d03fcbf200ae889047350323df.zip | |
[BZ #2126]
* sysdeps/i386/i686/strtok.S: Store pointer to NUL byte if NULL is
returned.
* sysdeps/i386/strtok.S: Likewise.
* sysdeps/x86_64/strtok.S: Likewise.
* string/Makefile (tests): Add bug-strtok1.
* string/bug-strtok1.c: New file.
Diffstat (limited to 'sysdeps/x86_64')
| -rw-r--r-- | sysdeps/x86_64/strtok.S | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sysdeps/x86_64/strtok.S b/sysdeps/x86_64/strtok.S index de427dc6f3..4037f0b850 100644 --- a/sysdeps/x86_64/strtok.S +++ b/sysdeps/x86_64/strtok.S @@ -1,6 +1,6 @@ /* strtok (str, delim) -- Return next DELIM separated token from STR. For AMD x86-64. - Copyright (C) 1998,2000,2001,2002,2003,2005 Free Software Foundation, Inc. + Copyright (C) 1998,2000-2003,2005,2006 Free Software Foundation, Inc. This file is part of the GNU C Library. Based on i686 version contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. @@ -205,6 +205,8 @@ L(epilogue): L(returnNULL): xorl %eax, %eax + /* Store the pointer to the next character. */ + movq %rdx, SAVE_PTR jmp L(epilogue) END (BP_SYM (FUNCTION)) |