Merge pull request Perl#9 from haarg/fix-vcmp-stack

Leont · web-flow · commit fe76e18f6644 · 2020-07-31T18:21:04.000+02:00
fix stack usage in vcmp method (cmp overload)
diff --git a/t/01base.t b/t/01base.t
@@ -47,3 +47,9 @@ ok defined($v), 'Fix for RT #47980';
     like $@, qr'Usage: version::new\(class, version\)',
 	'No implicit object creation when called as function';
 }
+
+{
+    eval { version::vcmp($^V) };
+    like $@, qr{Usage: version::\S+\(lobj, robj, \.\.\.\)},
+	'vcmp method throws error on single argument';
+}
diff --git a/vutil/vxs.inc b/vutil/vxs.inc
@@ -312,8 +312,8 @@ VXS(version_normal)
 VXS(version_vcmp)
 {
      dXSARGS;
-     if (items < 1)
-	 croak_xs_usage(cv, "lobj, ...");
+     if (items < 2)
+	 croak_xs_usage(cv, "lobj, robj, ...");
      SP -= items;
      {
 	  SV *	lobj;
@@ -322,7 +322,7 @@ VXS(version_vcmp)
 	       SV	*rs;
 	       SV	*rvs;
 	       SV * robj = ST(1);
-	       const IV	 swap = (IV)SvIV(ST(2));
+	       const int swap = items > 2 ? SvTRUE(ST(2)) : 0;
 
 	       if ( !ISA_VERSION_OBJ(robj) )
 	       {

Original file line number	Diff line number	Diff line change
`@@ -312,8 +312,8 @@ VXS(version_normal)`
`312`	`312`	`VXS(version_vcmp)`
`313`	`313`	`{`
`314`	`314`	`dXSARGS;`
`315`		`- if (items < 1)`
`316`		`- croak_xs_usage(cv, "lobj, ...");`
	`315`	`+ if (items < 2)`
	`316`	`+ croak_xs_usage(cv, "lobj, robj, ...");`
`317`	`317`	`SP -= items;`
`318`	`318`	`{`
`319`	`319`	`SV * lobj;`
`@@ -322,7 +322,7 @@ VXS(version_vcmp)`
`322`	`322`	`SV *rs;`
`323`	`323`	`SV *rvs;`
`324`	`324`	`SV * robj = ST(1);`
`325`		`- const IV swap = (IV)SvIV(ST(2));`
	`325`	`+ const int swap = items > 2 ? SvTRUE(ST(2)) : 0;`
`326`	`326`
`327`	`327`	`if ( !ISA_VERSION_OBJ(robj) )`
`328`	`328`	`{`