From bc795d0b3065b9d03fcbf200ae889047350323df Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 10 Jan 2006 00:25:07 +0000 Subject: [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. --- sysdeps/x86_64/strtok.S | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'sysdeps/x86_64') 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 , 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)) -- cgit v1.2.3