From: Ulrich Drepper <drepper@redhat.com>
Date: Tue, 14 Jul 1998 19:44:06 +0000 (+0000)
Subject: [_USE_IN_LIBIO] (encode_error): Free cancelation handler.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cd145f44005d718b519fca16ae75e2d0f3c01396;p=thirdparty%2Fglibc.git

[_USE_IN_LIBIO] (encode_error): Free cancelation handler.
(conv_error): Likewise.
(input_error): Likewise.
(memory_error): Likewise.
---

diff --git a/stdio-common/vfscanf.c b/stdio-common/vfscanf.c
index c02b4f4c4ae..39e8f3c9011 100644
--- a/stdio-common/vfscanf.c
+++ b/stdio-common/vfscanf.c
@@ -62,21 +62,25 @@
 # define encode_error()	do {						      \
 			  if (errp != NULL) *errp |= 4;			      \
 			  _IO_funlockfile (s);				      \
+			  __libc_cleanup_end (0);			      \
 			  __set_errno (EILSEQ);				      \
 			  return done;					      \
 			} while (0)
 # define conv_error()	do {						      \
 			  if (errp != NULL) *errp |= 2;			      \
 			  _IO_funlockfile (s);				      \
+			  __libc_cleanup_end (0);			      \
 			  return done;					      \
 			} while (0)
 # define input_error()	do {						      \
 			  _IO_funlockfile (s);				      \
+			  __libc_cleanup_end (0);			      \
 			  if (errp != NULL) *errp |= 1;			      \
 			  return done ?: EOF;				      \
 			} while (0)
 # define memory_error()	do {						      \
 			  _IO_funlockfile (s);				      \
+			  __libc_cleanup_end (0);			      \
 			  __set_errno (ENOMEM);				      \
 			  return EOF;					      \
 			} while (0)