[pmc] fix splice overflows with negative count

Fixes GH #766. Throw illegal argument with negative count arguments for now. TODO: Implement support for negative count argument for splice. Add more splice methods.
parrot · Nov 10, 2014 · ec7e1ac · ec7e1ac
1 parent 16091e9
commit ec7e1ac
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 4 deletions.
diff --git a/src/pmc/fixedpmcarray.pmc b/src/pmc/fixedpmcarray.pmc
@@ -703,9 +703,19 @@ of this array.
 */
 
     VTABLE void splice(PMC *value, INTVAL offset, INTVAL count) :manual_wb {
+        const INTVAL elems0 = VTABLE_elements(INTERP, SELF);
+        /* start from end? */
+        if (offset < 0)
+            offset += elems0;
+        if (offset < 0)
+            Parrot_ex_throw_from_c_args(INTERP, NULL, EXCEPTION_OUT_OF_BOUNDS,
+                                        _("illegal splice offset"));
+        if (count < 0)
+            Parrot_ex_throw_from_c_args(INTERP, NULL, EXCEPTION_OUT_OF_BOUNDS,
+                                        _("illegal argument"));
         if (count + offset > PMC_size(SELF))
             Parrot_ex_throw_from_c_args(INTERP, NULL, EXCEPTION_INVALID_OPERATION,
-                _("FixedPMCArray: index out of bounds!"));
+                _("index out of bounds"));
 
         for (count--; count >= 0; --count) {
             VTABLE_set_pmc_keyed_int(INTERP, SELF, offset + count, value);

diff --git a/src/pmc/resizablepmcarray.pmc b/src/pmc/resizablepmcarray.pmc
@@ -693,10 +693,15 @@ Note that the C<from> PMC can be of any of the various array types.
         /* start from end? */
         if (offset < 0)
             offset += elems0;
-
         if (offset < 0)
             Parrot_ex_throw_from_c_args(INTERP, NULL, EXCEPTION_OUT_OF_BOUNDS,
-                "illegal splice offset\n");
+                _("illegal splice offset"));
+        if (count < 0)
+            Parrot_ex_throw_from_c_args(INTERP, NULL, EXCEPTION_OUT_OF_BOUNDS,
+                _("illegal argument"));
+        if (count + offset > elems0)
+            Parrot_ex_throw_from_c_args(INTERP, NULL, EXCEPTION_OUT_OF_BOUNDS,
+                _("index out of bounds"));
 
         /* number of elements to the right of the splice (the "tail") */
         tail = elems0 - offset - count;

diff --git a/src/pmc/resizablestringarray.pmc b/src/pmc/resizablestringarray.pmc
@@ -605,7 +605,10 @@ everything via the VTABLE api.
 
         if (offset < 0)
             Parrot_ex_throw_from_c_args(INTERP, NULL, EXCEPTION_OUT_OF_BOUNDS,
-                "illegal splice offset\n");
+                _("illegal splice offset"));
+        if (count < 0)
+            Parrot_ex_throw_from_c_args(INTERP, NULL, EXCEPTION_OUT_OF_BOUNDS,
+                                        _("illegal argument"));
 
         /* shrink the array */
         if (shift < 0) {