From 0ea4967708e69a518d7a141ebab328e6d58b5401 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 13 Oct 2007 07:11:11 +0000 Subject: [BZ #4359] 2007-10-13 Ulrich Drepper [BZ #4359] * libio/__freading.c (__freading): Don't return true for write-only streams. --- ChangeLog | 6 ++++++ libio/__freading.c | 7 ++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6b89367..3a16e6a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-10-13 Ulrich Drepper + + [BZ #4359] + * libio/__freading.c (__freading): Don't return true for + write-only streams. + 2007-10-12 Ulrich Drepper * locale/programs/repertoire.c (repertoire_read): Always free diff --git a/libio/__freading.c b/libio/__freading.c index 37200bb..7eca27b 100644 --- a/libio/__freading.c +++ b/libio/__freading.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2002 Free Software Foundation, Inc. +/* Copyright (C) 2000, 2002, 2007 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 @@ -21,6 +21,7 @@ int __freading (FILE *fp) { - return ((fp->_flags & _IO_NO_WRITES) - || (fp->_flags & _IO_CURRENTLY_PUTTING) == 0); + return (((fp->_flags & _IO_NO_WRITES) + || (fp->_flags & _IO_CURRENTLY_PUTTING) == 0) + && (fp->_flags & _IO_NO_READS) == 0); } -- cgit v1.1