diff options
| author | Jeff Johnston <jjohnstn@redhat.com> | 2009-04-25 02:52:52 +0400 |
|---|---|---|
| committer | Jeff Johnston <jjohnstn@redhat.com> | 2009-04-25 02:52:52 +0400 |
| commit | bcde12940007e836f7b831f1cdfda8dc2bda0c58 (patch) | |
| tree | d9894d46eb51edf603939d8506bf0b5f97b9fa87 /newlib/libc/stdio/fgets.c | |
| parent | 35f31b6a983710aa9a2bd7e308d1567f326f3f5f (diff) | |
2009-04-24 Jeff johnston <jjohnstn@redhat.com>
* libc/stdio/fgetc.c: Make sure sfp lock is acquired before the
file lock and released before the file lock to avoid a deadlock
scenario.
* libc/stdio/fgets.c: Ditto.
* libc/stdio/fgetwc.c: Ditto.
* libc/stdio/fgetws.c: Ditto.
* libc/stdio/fread.c: Ditto.
* libc/stdio/fseek.c: Ditto.
* libc/stdio/getc.c: Ditto.
* libc/stdio/getdelim.c: Ditto.
* libc/stdio/gets.c: Ditto.
Diffstat (limited to 'newlib/libc/stdio/fgets.c')
| -rw-r--r-- | newlib/libc/stdio/fgets.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/newlib/libc/stdio/fgets.c b/newlib/libc/stdio/fgets.c index 7f02e3fcb..21bfdd4c6 100644 --- a/newlib/libc/stdio/fgets.c +++ b/newlib/libc/stdio/fgets.c @@ -98,6 +98,7 @@ _DEFUN(_fgets_r, (ptr, buf, n, fp), CHECK_INIT(ptr, fp); + __sfp_lock_acquire (); _flockfile (fp); #ifdef __SCLE if (fp->_flags & __SCLE) @@ -113,10 +114,12 @@ _DEFUN(_fgets_r, (ptr, buf, n, fp), if (c == EOF && s == buf) { _funlockfile (fp); + __sfp_lock_release (); return NULL; } *s = 0; _funlockfile (fp); + __sfp_lock_release (); return buf; } #endif @@ -135,6 +138,7 @@ _DEFUN(_fgets_r, (ptr, buf, n, fp), if (s == buf) { _funlockfile (fp); + __sfp_lock_release (); return 0; } break; @@ -160,6 +164,7 @@ _DEFUN(_fgets_r, (ptr, buf, n, fp), _CAST_VOID memcpy ((_PTR) s, (_PTR) p, len); s[len] = 0; _funlockfile (fp); + __sfp_lock_release (); return (buf); } fp->_r -= len; @@ -170,6 +175,7 @@ _DEFUN(_fgets_r, (ptr, buf, n, fp), while ((n -= len) != 0); *s = 0; _funlockfile (fp); + __sfp_lock_release (); return buf; } |