From fcb8da00bbf96c055c5bfb9ae7a8086051c6f3b0 Mon Sep 17 00:00:00 2001
From: Tony Cook <tony@develop-help.com>
Date: Sat, 24 Mar 2012 00:27:52 +0100
Subject: [PATCH] [rt #111730] don't use I32 for offsets in vec()

do_vecset() do_vecget() used I32 for the offset, which meant that
offsets outside the -2Gb - +2Gb offset were truncated, resulting in
various misbehaviours.
---
 doop.c         | 6 +++---
 embed.fnc      | 2 +-
 proto.h        | 2 +-
 t/bigmem/vec.t | 4 +---
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/doop.c b/doop.c
index f130477..a562536 100644
--- a/doop.c
+++ b/doop.c
@@ -760,7 +760,7 @@ Perl_do_sprintf(pTHX_ SV *sv, I32 len, SV **sarg)
 
 /* currently converts input to bytes if possible, but doesn't sweat failure */
 UV
-Perl_do_vecget(pTHX_ SV *sv, I32 offset, I32 size)
+Perl_do_vecget(pTHX_ SV *sv, SSize_t offset, int size)
 {
     dVAR;
     STRLEN srclen, len, uoffset, bitoffs = 0;
@@ -908,8 +908,8 @@ void
 Perl_do_vecset(pTHX_ SV *sv)
 {
     dVAR;
-    register I32 offset, bitoffs = 0;
-    register I32 size;
+    register SSize_t offset, bitoffs = 0;
+    register int size;
     register unsigned char *s;
     register UV lval;
     I32 mask;
diff --git a/embed.fnc b/embed.fnc
index 5379121..b637124 100644
--- a/embed.fnc
+++ b/embed.fnc
@@ -379,7 +379,7 @@ pR	|Off_t	|do_tell	|NN GV* gv
 : Defined in doop.c, used only in pp.c
 p	|I32	|do_trans	|NN SV* sv
 : Used in my.c and pp.c
-p	|UV	|do_vecget	|NN SV* sv|I32 offset|I32 size
+p	|UV	|do_vecget	|NN SV* sv|SSize_t offset|int size
 : Defined in doop.c, used only in mg.c (with /* XXX slurp this routine */)
 p	|void	|do_vecset	|NN SV* sv
 : Defined in doop.c, used only in pp.c
diff --git a/proto.h b/proto.h
index eab2626..f9327bb 100644
--- a/proto.h
+++ b/proto.h
@@ -893,7 +893,7 @@ PERL_CALLCONV I32	Perl_do_trans(pTHX_ SV* sv)
 #define PERL_ARGS_ASSERT_DO_TRANS	\
 	assert(sv)
 
-PERL_CALLCONV UV	Perl_do_vecget(pTHX_ SV* sv, I32 offset, I32 size)
+PERL_CALLCONV UV	Perl_do_vecget(pTHX_ SV* sv, SSize_t offset, int size)
 			__attribute__nonnull__(pTHX_1);
 #define PERL_ARGS_ASSERT_DO_VECGET	\
 	assert(sv)
diff --git a/t/bigmem/vec.t b/t/bigmem/vec.t
index ccdbb9b..bf3c513 100644
--- a/t/bigmem/vec.t
+++ b/t/bigmem/vec.t
@@ -16,12 +16,11 @@ $Config{ptrsize} >= 8
 plan(7);
 
 # RT #111730: Negative offset to vec in lvalue context
-local $::TODO = "RT #111730 - vec uses I32 for offsets";
 
 my $v = "";
 ok(scalar eval { vec($v, 0x80000000, 1) = 1 }, "set a bit at a large offset");
 ok(vec($v, 0x80000000, 1), "check a bit at a large offset");
-{ local $::TODO; # succeeds but shouldn't at this point
+
 ok(scalar eval { vec($v, 0x100000000, 1) = 1 },
    "set a bit at a larger offset");
 ok(vec($v, 0x100000000, 1), "check a bit at a larger offset");
@@ -29,7 +28,6 @@ ok(vec($v, 0x100000000, 1), "check a bit at a larger offset");
 # real out of range values
 ok(!eval { vec($v, -0x80000000, 1) = 1 },
    "shouldn't be able to set at a large negative offset");
-}
 ok(!eval { vec($v, -0x100000000, 1) = 1 },
    "shouldn't be able to set at a larger negative offset");
 
-- 
2.7.4