Code smell (protect result of Rf_mkString)

kevinushey · kevinushey · commit 7e0218c8324b · 2014-05-28T22:04:14.000-07:00
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-28  Kevin Ushey  <kevinushey@gmail.com>
+
+        * inst/include/Rcpp/vector/vector_from_string.h: Protect result of
+        Rf_mkString
+
 2014-05-23  Dirk Eddelbuettel  <edd@debian.org>
 
         * R/Module.R (new_dummyObject): Remove erraneous quotes
diff --git a/inst/include/Rcpp/vector/vector_from_string.h b/inst/include/Rcpp/vector/vector_from_string.h
@@ -27,7 +27,8 @@ namespace internal{
 
     template <int RTYPE>
     inline SEXP vector_from_string( const std::string& st ) {
-        return r_cast<RTYPE>( Rf_mkString( st.c_str() ) ) ;
+        Shield<SEXP> str(Rf_mkString(st.c_str()));
+        return r_cast<RTYPE>(str) ;
     }
 
     template <int RTYPE>

-Original file line number
+Diff line change
@@ @@ -1,3 +1,8 @@ @@
 +2014-05-28  Kevin Ushey  <[email protected]>
++
 +        * inst/include/Rcpp/vector/vector_from_string.h: Protect result of
 +        Rf_mkString
++
 -05-23  Dirk Eddelbuettel  <[email protected]>
         * R/Module.R (new_dummyObject): Remove erraneous quotes
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,8 @@ namespace internal{`
`27`	`27`
`28`	`28`	`template <int RTYPE>`
`29`	`29`	`inline SEXP vector_from_string( const std::string& st ) {`
`30`		`- return r_cast<RTYPE>( Rf_mkString( st.c_str() ) ) ;`
	`30`	`+ Shield<SEXP> str(Rf_mkString(st.c_str()));`
	`31`	`+ return r_cast<RTYPE>(str) ;`
`31`	`32`	`}`
`32`	`33`
`33`	`34`	`template <int RTYPE>`