fix overflow in matrix column

Qiang Kou · Qiang Kou · commit b99f5aa6ad3f · 2015-11-01T19:08:21.000-05:00
diff --git a/inst/include/Rcpp/vector/MatrixColumn.h b/inst/include/Rcpp/vector/MatrixColumn.h
@@ -36,16 +36,16 @@ class MatrixColumn : public VectorBase<RTYPE,true,MatrixColumn<RTYPE> > {
 
     MatrixColumn( MATRIX& parent, int i ) :
         n(parent.nrow()),
-        start(parent.begin() + i * n ),
-        const_start(const_cast<const MATRIX&>(parent).begin() + i *n)
+        start(parent.begin() + static_cast<R_xlen_t>(i) * n ),
+        const_start(const_cast<const MATRIX&>(parent).begin() + static_cast<R_xlen_t>(i) * n)
     {
         if( i < 0 || i >= parent.ncol() ) throw index_out_of_bounds() ;
     }
 
     MatrixColumn( const MATRIX& parent, int i ) :
         n(parent.nrow()),
-        start( const_cast<MATRIX&>(parent).begin() + i * n ),
-        const_start(parent.begin() + i *n)
+        start( const_cast<MATRIX&>(parent).begin() + static_cast<R_xlen_t>(i) * n ),
+        const_start(parent.begin() + static_cast<R_xlen_t>(i) * n)
     {
         if( i < 0 || i >= parent.ncol() ) throw index_out_of_bounds() ;
     }

Original file line number	Diff line number	Diff line change
`@@ -36,16 +36,16 @@ class MatrixColumn : public VectorBase<RTYPE,true,MatrixColumn<RTYPE> > {`
`36`	`36`
`37`	`37`	`MatrixColumn( MATRIX& parent, int i ) :`
`38`	`38`	`n(parent.nrow()),`
`39`		`- start(parent.begin() + i * n ),`
`40`		`- const_start(const_cast<const MATRIX&>(parent).begin() + i *n)`
	`39`	`+ start(parent.begin() + static_cast<R_xlen_t>(i) * n ),`
	`40`	`+ const_start(const_cast<const MATRIX&>(parent).begin() + static_cast<R_xlen_t>(i) * n)`
`41`	`41`	`{`
`42`	`42`	`if( i < 0 \|\| i >= parent.ncol() ) throw index_out_of_bounds() ;`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`MatrixColumn( const MATRIX& parent, int i ) :`
`46`	`46`	`n(parent.nrow()),`
`47`		`- start( const_cast<MATRIX&>(parent).begin() + i * n ),`
`48`		`- const_start(parent.begin() + i *n)`
	`47`	`+ start( const_cast<MATRIX&>(parent).begin() + static_cast<R_xlen_t>(i) * n ),`
	`48`	`+ const_start(parent.begin() + static_cast<R_xlen_t>(i) * n)`
`49`	`49`	`{`
`50`	`50`	`if( i < 0 \|\| i >= parent.ncol() ) throw index_out_of_bounds() ;`
`51`	`51`	`}`