diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 19:31:37 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 19:31:37 +0000 |
| commit | 74a412373b66a38b6ce8156f027ce26f89a7462f (patch) | |
| tree | a59ce0af7ffd48641ca9124d697f7a6b57b26931 /debug/gets_chk.c | |
| parent | 2004eeba8fb2a92105bbf95b280fff6dc1d84144 (diff) | |
| parent | 4cbfda396f7cd9e83116c28965ade73d80c1cb82 (diff) | |
Merge commit 'refs/top-bases/t/ONSTACK' into t/ONSTACK
Diffstat (limited to 'debug/gets_chk.c')
| -rw-r--r-- | debug/gets_chk.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/debug/gets_chk.c b/debug/gets_chk.c index aebc9eb705..2b1416b295 100644 --- a/debug/gets_chk.c +++ b/debug/gets_chk.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1993-2016 Free Software Foundation, Inc. +/* Copyright (C) 1993-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -30,7 +30,7 @@ char * __gets_chk (char *buf, size_t size) { - _IO_size_t count; + size_t count; int ch; char *retval; @@ -51,17 +51,17 @@ __gets_chk (char *buf, size_t size) /* This is very tricky since a file descriptor may be in the non-blocking mode. The error flag doesn't mean much in this case. We return an error only when there is a new error. */ - int old_error = _IO_stdin->_IO_file_flags & _IO_ERR_SEEN; - _IO_stdin->_IO_file_flags &= ~_IO_ERR_SEEN; + int old_error = _IO_stdin->_flags & _IO_ERR_SEEN; + _IO_stdin->_flags &= ~_IO_ERR_SEEN; buf[0] = (char) ch; count = _IO_getline (_IO_stdin, buf + 1, size - 1, '\n', 0) + 1; - if (_IO_stdin->_IO_file_flags & _IO_ERR_SEEN) + if (_IO_stdin->_flags & _IO_ERR_SEEN) { retval = NULL; goto unlock_return; } else - _IO_stdin->_IO_file_flags |= old_error; + _IO_stdin->_flags |= old_error; } if (count >= size) __chk_fail (); |