Merge pull request #559 from ugexe/patch-6

Fix unpack for templates using `*`
rakudo · Oct 23, 2015 · 75ac71b · 75ac71b
2 parents f25bbe7 + d97f0b2
commit 75ac71b
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/core/Buf.pm b/src/core/Buf.pm
@@ -169,12 +169,14 @@ my role Blob[::T = uint8] does Positional[T] does Stringy is repr('VMArray') is
                 }
                 when 'S' | 'v' {
                     for ^$pa {
+                        last if @bytes.elems < 2;
                         @fields.append: shift(@bytes)
                                     + (shift(@bytes) +< 0x08);
                     }
                 }
                 when 'L' | 'V' {
                     for ^$pa {
+                        last if @bytes.elems < 4;
                         @fields.append: shift(@bytes)
                                     + (shift(@bytes) +< 0x08)
                                     + (shift(@bytes) +< 0x10)
@@ -183,12 +185,14 @@ my role Blob[::T = uint8] does Positional[T] does Stringy is repr('VMArray') is
                 }
                 when 'n' {
                     for ^$pa {
+                        last if @bytes.elems < 2;
                         @fields.append: (shift(@bytes) +< 0x08)
                                     + shift(@bytes);
                     }
                 }
                 when 'N' {
                     for ^$pa {
+                        last if @bytes.elems < 4;
                         @fields.append: (shift(@bytes) +< 0x18)
                                     + (shift(@bytes) +< 0x10)
                                     + (shift(@bytes) +< 0x08)