Change 34596 by [EMAIL PROTECTED] on 2008/10/26 18:37:35
Cope with brain damage in PerlIO::via, which will let you fclose() the
same FILE * twice, thanks to it calling out to Perl space inside the
close call tree, with the underlying PerlIO* already closed, but not
unlinked.
Affected files ...
... //depot/perl/perlio.c#389 edit
Differences ...
==== //depot/perl/perlio.c#389 (text) ====
Index: perl/perlio.c
--- perl/perlio.c#388~34585~ 2008-10-25 05:23:01.000000000 -0700
+++ perl/perlio.c 2008-10-26 11:37:35.000000000 -0700
@@ -3144,8 +3144,15 @@
if (getsockopt(fd, SOL_SOCKET, SO_TYPE, (void *) &optval, &optlen) == 0)
invalidate = 1;
#endif
- if (PerlIOUnix_refcnt_dec(fd) > 0) /* File descriptor still in use */
+ /* Test for -1, as *BSD stdio (at least) on fclose sets the FILE* such
+ that a subsequent fileno() on it returns -1. Don't want to croak()
+ from within PerlIOUnix_refcnt_dec() if some buggy caller code is
+ trying to close an already closed handle which somehow it still has
+ a reference to. (via.xs, I'm looking at you). */
+ if (fd != -1 && PerlIOUnix_refcnt_dec(fd) > 0) {
+ /* File descriptor still in use */
invalidate = 1;
+ }
if (invalidate) {
/* For STD* handles, don't close stdio, since we shared the FILE *,
too. */
if (stdio == stdin) /* Some stdios are buggy fflush-ing inputs */
End of Patch.
