Z*/[AZa]* fails to pack length properly

Message-ID: <200111211023160020.0050BD28@smtp.chello.at>

p4raw-id: //depot/perl@13163

diff --git a/pp_pack.c b/pp_pack.c
index 021c35c..705ee12 100644 (file)
--- a/pp_pack.c
+++ b/pp_pack.c
@@ -1386,7 +1386,7 @@ PP(pp_pack)
        case 'a':
            fromstr = NEXTFROM;
            aptr = SvPV(fromstr, fromlen);
-           if (pat[-1] == '*') {
+           if (pat[lengthcode ? -2 : -1] == '*') { /* -2 after '/' */  
                len = fromlen;
                if (datumtype == 'Z')
                    ++len;

diff --git a/t/op/pack.t b/t/op/pack.t
index d044203..5107510 100755 (executable)
--- a/t/op/pack.t
+++ b/t/op/pack.t
@@ -1,6 +1,6 @@
 #!./perl -w
 
-print "1..613\n";
+print "1..614\n";
 
 BEGIN {
     chdir 't' if -d 't';
@@ -676,3 +676,22 @@ foreach (
 
     ok(scalar unpack("w/a*", "\x02abc") eq "ab");
 }
+
+{
+    # 614
+    
+    # from Wolfgang Laun: fix in change #13163
+
+    my $s = 'ABC' x 10;
+    my $x = 42;
+    my $buf = pack( 'Z*/A* C',  $s, $x );
+    my $y;
+
+    my $h = $buf;
+    $h =~ s/[^[:print:]]/./g;
+    ( $s, $y ) = unpack( "Z*/A* C", $buf );
+    ok($h eq "30.ABCABCABCABCABCABCABCABCABCABC*" &&
+       length $buf == 34 &&
+       $s eq "ABCABCABCABCABCABCABCABCABCABC" &
+       $y == 42);
+}