flow: Merged <feature> 'RT-118087' to <develop> ('develop').

Author: John Peacock

Makefile.PL

@@ -50,6 +50,7 @@ sub write_makefile
         'Test::More'            => 0.45,
         'File::Temp'            => 0.13,
         'parent'                => 0.221,
+        'Test::Taint'           => 1.06,
     );
 
     WriteMakefile( VERSION         => '0.9917',

t/11_taint.t

@@ -0,0 +1,16 @@
+#!perl -T
+use Test::More qw/no_plan/;
+
+use Test::Taint;
+use version;
+
+taint_checking_ok();
+my $v = 'v1.2.3';
+taint($v);
+tainted_ok($v);
+my $v2 = version->parse($v);
+isnt("$v2", '', 'Correctly parsed the tainted string');
+tainted_ok($v2);
+
+my $vs = "$v2";
+is $v2, 'v1.2.3';

vutil/vutil.c

@@ -968,7 +968,11 @@ Perl_vstringify(pTHX_ SV *vs)
     if (svp) {
 	SV *pv;
 	pv = *svp;
-	if ( SvPOK(pv) )
+	if ( SvPOK(pv)
+#if PERL_VERSION_LT(5,17,2)
+	    || SvPOKp(pv)
+#endif
+	)
 	    return newSVsv(pv);
 	else
 	    return &PL_sv_undef;