Change 16224 by jhi@alpha on 2002/04/27 17:53:20
Integrate perlio;
Correct which var is nulled, stack movement protection.
Affected files ...
.... //depot/perl/ext/PerlIO/encoding/encoding.xs#10 integrate
Differences ...
==== //depot/perl/ext/PerlIO/encoding/encoding.xs#10 (text) ====
Index: perl/ext/PerlIO/encoding/encoding.xs
--- perl/ext/PerlIO/encoding/encoding.xs.~1~ Sat Apr 27 12:00:05 2002
+++ perl/ext/PerlIO/encoding/encoding.xs Sat Apr 27 12:00:05 2002
@@ -161,7 +161,7 @@
}
if (e->chk) {
SvREFCNT_dec(e->chk);
- e->dataSV = Nullsv;
+ e->chk = Nullsv;
}
return 0;
}
@@ -595,10 +595,16 @@
* is invoked without prior "use Encode". -- dankogai
*/
if (!gv_stashpvn("Encode", 6, FALSE)) {
+#if 0
+ /* This would just be an irritant now loading works */
Perl_warner(aTHX_ packWARN(WARN_IO), ":encoding without 'use Encode'");
+#endif
ENTER;
+ /* Encode needs a lot of stack - it is likely to move ... */
+ PUTBACK;
/* The SV is magically freed by load_module */
load_module(PERL_LOADMOD_NOIMPORT, newSVpvn("Encode", 6), Nullsv, Nullsv);
+ SPAGAIN;
LEAVE;
}
PUSHMARK(sp);
End of Patch.
