PerlIO-scalar-0.29

Author: rurban

dist/Module-CoreList/lib/Module/CoreList.pm

@@ -17295,7 +17295,7 @@ our %delta = (
             'mro'                   => '1.21_01',
             'Net::Ping'             => '2.70',
             'perlfaq'               => '5.20180605',
-            'PerlIO::scalar'        => '0.29_01',
+            'PerlIO::scalar'        => '0.29',
             'PerlIO::via'           => '0.17_01',
             'Pod::Checker'          => '1.73_01',
             'Pod::Man'              => '4.11',
@@ -17556,6 +17556,7 @@ our %delta = (
             'IPC::Cmd'              => '1.02',
             'Net::Ping'             => '2.70',
             'NEXT'                  => '0.67_01',
+            'PerlIO::scalar'        => '0.29',
             'List::Util'            => '1.50_11',
             'List::Util::XS'        => '1.50_11',
             'Scalar::Util'          => '1.50_11',

ext/PerlIO-scalar/scalar.pm

@@ -1,5 +1,5 @@
 package PerlIO::scalar;
-our $VERSION = '0.24';
+our $VERSION = '0.29';
 require XSLoader;
 XSLoader::load();
 1;

ext/PerlIO-scalar/scalar.xs

@@ -15,6 +15,18 @@ typedef struct {
     Off_t posn;
 } PerlIOScalar;
 
+IV
+PerlIOScalar_eof(pTHX_ PerlIO * f)
+{
+    if (PerlIOBase(f)->flags & PERLIO_F_CANREAD) {
+        PerlIOScalar *s = PerlIOSelf(f, PerlIOScalar);
+        STRLEN len;
+        (void)SvPV(s->var, len);
+        return len - (STRLEN)(s->posn) <= 0;
+    }
+    return 1;
+}
+
 static IV
 PerlIOScalar_pushed(pTHX_ PerlIO * f, const char *mode, SV * arg,
 		    PerlIO_funcs * tab)
@@ -31,7 +43,7 @@ PerlIOScalar_pushed(pTHX_ PerlIO * f, const char *mode, SV * arg,
 	     && mode && *mode != 'r') {
 		if (ckWARN(WARN_LAYER))
 		    Perl_warner(aTHX_ packWARN(WARN_LAYER), "%s", PL_no_modify);
-		SETERRNO(EINVAL, SS_IVCHAN);
+		SETERRNO(EACCES, RMS_PRV);
 		return -1;
 	    }
 	    s->var = SvREFCNT_inc(SvRV(arg));
@@ -174,8 +186,8 @@ PerlIOScalar_read(pTHX_ PerlIO *f, void *vbuf, Size_t count)
          * seems safe) and that the size of the buffer in our SV is
          * always less than half the size of the address space
          */
-        assert(sizeof(Off_t) >= sizeof(len));
-        assert((Off_t)len >= 0); /* unsigned with 32bit */
+        STATIC_ASSERT_STMT(sizeof(Off_t) >= sizeof(len));
+        assert(len < ((~(STRLEN)0) >> 1)); /* unsigned with 32bit */
         if ((Off_t)len <= s->posn)
 	    return 0;
 	got = len - (STRLEN)(s->posn);
@@ -406,7 +418,7 @@ static PERLIO_FUNCS_DECL(PerlIO_scalar) = {
     PerlIOScalar_close,
     PerlIOScalar_flush,
     PerlIOScalar_fill,
-    PerlIOBase_eof,
+    PerlIOScalar_eof,
     PerlIOBase_error,
     PerlIOBase_clearerr,
     PerlIOBase_setlinebuf,

ext/PerlIO-scalar/t/scalar.t

@@ -13,10 +13,11 @@ BEGIN {
 }
 
 use Fcntl qw(SEEK_SET SEEK_CUR SEEK_END); # Not 0, 1, 2 everywhere.
+use Errno qw(EACCES);
 
 $| = 1;
 
-use Test::More tests => 122;
+use Test::More tests => 123;
 
 my $fh;
 my $var = "aaa\n";
@@ -185,6 +186,7 @@ EOF
 
     my $ro = \43;
     ok(!(defined open(F, '>', $ro)), $!);
+    is($!+0, EACCES, "check we get a read-onlyish error code");
     close F;
     # but we can read from it
     ok(open(F, '<', $ro), $!);

pod/perlcdelta.pod

@@ -430,6 +430,12 @@ better icmpv6 support.
 
 Fix for GLOB stubs [cpan #123002].
 
+=item L<PerlIO::scalar> 0.29
+
+check invariant at compile time.
+
+return EACCES on writing to a read-only scalar
+
 =item Scalar-List-Util 1.50_11
 
 fix C<find_rundefsvoffset> logic.