Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
[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.
- Loading branch information
Ulrich Drepper
committed
Jan 10, 2006
1 parent
71ea167
commit bc795d0
Showing
6 changed files
with
70 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
/* See BZ #2126. */ | ||
#include <string.h> | ||
#include <stdio.h> | ||
|
||
static int | ||
do_test (void) | ||
{ | ||
const char str[] = "axaaba"; | ||
char *token; | ||
char *cp; | ||
char *l; | ||
int result = 0; | ||
|
||
puts ("test strtok"); | ||
cp = strdupa (str); | ||
printf ("cp = %p, len = %zu\n", cp, strlen (cp)); | ||
token = strtok (cp, "ab"); | ||
result |= token == NULL || strcmp (token, "x"); | ||
printf ("token: %s (%d)\n", token ? token : "NULL", result); | ||
token = strtok(0, "ab"); | ||
result |= token != NULL; | ||
printf ("token: %s (%d)\n", token ? token : "NULL", result); | ||
token = strtok(0, "a"); | ||
result |= token != NULL; | ||
printf ("token: %s (%d)\n", token ? token : "NULL", result); | ||
|
||
puts ("test strtok_r"); | ||
cp = strdupa (str); | ||
size_t len = strlen (cp); | ||
printf ("cp = %p, len = %zu\n", cp, len); | ||
token = strtok_r (cp, "ab", &l); | ||
result |= token == NULL || strcmp (token, "x"); | ||
printf ("token: %s, next = %p (%d)\n", token ? token : "NULL", l, result); | ||
token = strtok_r(0, "ab", &l); | ||
result |= token != NULL || l != cp + len; | ||
printf ("token: %s, next = %p (%d)\n", token ? token : "NULL", l, result); | ||
token = strtok_r(0, "a", &l); | ||
result |= token != NULL || l != cp + len; | ||
printf ("token: %s, next = %p (%d)\n", token ? token : "NULL", l, result); | ||
|
||
return result; | ||
} | ||
|
||
#define TEST_FUNCTION do_test () | ||
#include "../test-skeleton.c" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters