add tests; implement bounds check for proxy

Author: kevinushey

inst/include/Rcpp/vector/traits.h

@@ -45,44 +45,21 @@ namespace traits{
 		inline iterator get() const { return start; }
 		inline const_iterator get_const() const { return start; }
 
-		inline proxy ref() {
-#ifndef RCPP_NO_BOUNDS_CHECK
-			check_index(0) ;
-#endif
-			return start[0];
-		}
-
-		inline proxy ref() const {
-#ifndef RCPP_NO_BOUNDS_CHECK
-			check_index(0) ;
-#endif
-			return start[0] ;
-		}
-
-		inline proxy ref(R_xlen_t i) {
-#ifndef RCPP_NO_BOUNDS_CHECK
-			check_index(i) ;
-#endif
-			return start[i] ;
-		}
+		inline proxy ref() { check_index(0); return start[0] ;}
+		inline proxy ref(R_xlen_t i) { check_index(i); return start[i] ; }
 
-
-		inline proxy ref(R_xlen_t i) const {
-#ifndef RCPP_NO_BOUNDS_CHECK
-			check_index(i) ;
-#endif
-			return start[i] ;
-		}
+		inline proxy ref() const { check_index(0); return start[0] ;}
+		inline proxy ref(R_xlen_t i) const { check_index(i); return start[i] ; }
 
 	private:
 
-#ifndef RCPP_NO_BOUNDS_CHECK
 		void check_index(R_xlen_t i) const {
+#ifndef RCPP_NO_BOUNDS_CHECK
 			if (i >= size) {
 				stop("subscript out of bounds (index %s >= vector size %s)", i, size);
 			}
-		}
 #endif
+		}
 
 		iterator start ;
 		R_xlen_t size ;
@@ -102,18 +79,25 @@ namespace traits{
 		void update( const VECTOR& v ){
 			p = const_cast<VECTOR*>(&v) ;
 		}
-		inline iterator get() const { return iterator( proxy(*p, 0 ) ) ;}
-		// inline const_iterator get_const() const { return const_iterator( *p ) ;}
-		inline const_iterator get_const() const { return const_iterator( const_proxy(*p, 0) ) ; }
+		inline iterator get() const { check_index(0); return iterator( proxy(*p, 0 ) ) ;}
+		inline const_iterator get_const() const { check_index(0); return const_iterator( const_proxy(*p, 0) ) ; }
 
-		inline proxy ref() { return proxy(*p,0) ; }
-		inline proxy ref(R_xlen_t i) { return proxy(*p,i);}
+		inline proxy ref() { check_index(0); return proxy(*p,0) ; }
+		inline proxy ref(R_xlen_t i) { check_index(i); return proxy(*p,i);}
 
-		inline const_proxy ref() const { return const_proxy(*p,0) ; }
-		inline const_proxy ref(R_xlen_t i) const { return const_proxy(*p,i);}
+		inline const_proxy ref() const { check_index(0); return const_proxy(*p,0) ; }
+		inline const_proxy ref(R_xlen_t i) const { check_index(i); return const_proxy(*p,i);}
 
 	private:
 		VECTOR* p ;
+
+		void check_index(R_xlen_t i) const {
+#ifndef RCPP_NO_BOUNDS_CHECK
+			if (i >= size) {
+				stop("subscript out of bounds (index %s >= vector size %s)", i, size);
+			}
+#endif
+		}
 	} ;
 
 	// regular types for INTSXP, REALSXP, ...

inst/tinytest/cpp/Vector.cpp

@@ -886,3 +886,15 @@ bool CharacterVector_test_equality_crosspolicy(CharacterVector x, Vector<STRSXP,
 
     return std::equal(x.begin(), x.end(), y.begin());
 }
+
+// [[Rcpp::export]]
+double NumericVector_test_out_of_bounds_read() {
+    NumericVector v(3);
+    return v[5];
+}
+
+// [[Rcpp::export]]
+SEXP CharacterVector_test_out_of_bounds_read() {
+    CharacterVector v(3);
+    return v[5];
+}

inst/tinytest/test_vector.R

@@ -694,3 +694,7 @@ expect_equal(data, data2)
 #    test.CharacterVector_test_equality <- function(){
 expect_true( !CharacterVector_test_equality("foo", "bar") )
 expect_true( !CharacterVector_test_equality_crosspolicy("foo", "bar") )
+
+
+expect_error(NumericVector_test_out_of_bounds_read())
+expect_error(CharacterVector_test_out_of_bounds_read())