diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2005-06-27 13:24:44 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2005-06-27 13:24:44 +0000 |
| commit | 03d65262fdcc287ef8b691c7dff2f1a63cdd13c2 (patch) | |
| tree | a8ac7c86519f55a4aadf31b0c9e075eaf96ea0e3 /libio | |
| parent | 5570fbd25a574d54ab135e1d3cdac0bc74029689 (diff) | |
| download | glibc-03d65262fdcc287ef8b691c7dff2f1a63cdd13c2.tar.gz glibc-03d65262fdcc287ef8b691c7dff2f1a63cdd13c2.tar.xz glibc-03d65262fdcc287ef8b691c7dff2f1a63cdd13c2.zip | |
2.3.90-1 cvs/fedora-glibc-2_3_90-1
Diffstat (limited to 'libio')
| -rw-r--r-- | libio/bits/stdio2.h | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/libio/bits/stdio2.h b/libio/bits/stdio2.h index a462c1d8cf..f1d745c699 100644 --- a/libio/bits/stdio2.h +++ b/libio/bits/stdio2.h @@ -94,7 +94,8 @@ gets (char *__str) return __gets_alias (__str); } -extern void __chk_fail (void) __attribute__((__noreturn__)); +extern char *__fgets_chk (char *__restrict __s, size_t __size, int __n, + FILE *__restrict __stream) __wur; extern char *__REDIRECT (__fgets_alias, (char *__restrict __s, int __n, FILE *__restrict __stream), fgets) __wur; @@ -102,12 +103,15 @@ extern char *__REDIRECT (__fgets_alias, extern __always_inline __wur char * fgets (char *__restrict __s, int __n, FILE *__restrict __stream) { - if (__bos (__s) != (size_t) -1 && (size_t) __n > __bos (__s)) - __chk_fail (); + if (__bos (__s) != (size_t) -1 + && (!__builtin_constant_p (__n) || (size_t) __n > __bos (__s))) + return __fgets_chk (__s, __bos (__s), __n, __stream); return __fgets_alias (__s, __n, __stream); } #ifdef __USE_GNU +extern char *__fgets_unlocked_chk (char *__restrict __s, size_t __size, + int __n, FILE *__restrict __stream) __wur; extern char *__REDIRECT (__fgets_unlocked_alias, (char *__restrict __s, int __n, FILE *__restrict __stream), fgets_unlocked) __wur; @@ -115,8 +119,9 @@ extern char *__REDIRECT (__fgets_unlocked_alias, extern __always_inline __wur char * fgets_unlocked (char *__restrict __s, int __n, FILE *__restrict __stream) { - if (__bos (__s) != (size_t) -1 && (size_t) __n > __bos (__s)) - __chk_fail (); + if (__bos (__s) != (size_t) -1 + && (!__builtin_constant_p (__n) || (size_t) __n > __bos (__s))) + return __fgets_unlocked_chk (__s, __bos (__s), __n, __stream); return __fgets_unlocked_alias (__s, __n, __stream); } #endif |