Integrate mainline.

[p5sagit/p5-mst-13.2.git] / ext / PerlIO / scalar / scalar.xs

diff --git a/ext/PerlIO/scalar/scalar.xs b/ext/PerlIO/scalar/scalar.xs
index c027bd1..7bcee57 100644 (file)
--- a/ext/PerlIO/scalar/scalar.xs
+++ b/ext/PerlIO/scalar/scalar.xs
@@ -25,6 +25,8 @@ PerlIOScalar_pushed(pTHX_ PerlIO * f, const char *mode, SV * arg,
     if (arg) {
        if (SvROK(arg)) {
            s->var = SvREFCNT_inc(SvRV(arg));
+           if (!SvPOK(s->var))
+               (void)SvPV_nolen(s->var);
        }
        else {
            s->var =