Refine NamesProxy setter to set only non-NULL values

eddelbuettel · eddelbuettel · commit 24bce5eded56 · 2026-04-03T13:13:51.000-05:00
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+2026-04-03  Dirk Eddelbuettel  <edd@debian.org>
+
+	* inst/include/Rcpp/proxy/NamesProxy.h (set): Only set non-null values
+
 2026-04-01  Mattias Ellert  <mattias.ellert@physics.uu.se>
 
 	* inst/discovery/cxx0x.R: Set execute permissions for script
diff --git a/inst/include/Rcpp/proxy/NamesProxy.h b/inst/include/Rcpp/proxy/NamesProxy.h
@@ -1,5 +1,5 @@
 // Copyright (C) 2013 - 2025  Romain Fran&ccedil;ois
-// Copyright (C) 2026         Romain Fran&ccedil;ois and I&ntilde;aki Ucar
+// Copyright (C) 2026         Romain Fran&ccedil;ois, I&ntilde;aki Ucar and Dirk Eddelbuettel
 //
 // This file is part of Rcpp.
 //
@@ -48,7 +48,8 @@ class NamesProxyPolicy{
         }
 
         void set(SEXP x) {
-            Rf_namesgets(parent, Shield<SEXP>(x));
+            if (!Rf_isNull(x))
+               Rf_namesgets(parent, Shield<SEXP>(x));
         }
 
     } ;

-Original file line number
+Diff line change
@@ @@ -1,3 +1,7 @@ @@
 +2026-04-03  Dirk Eddelbuettel  <[email protected]>
++
 +	* inst/include/Rcpp/proxy/NamesProxy.h (set): Only set non-null values
++
 -04-01  Mattias Ellert  <[email protected]>
 	* inst/discovery/cxx0x.R: Set execute permissions for script
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`// Copyright (C) 2013 - 2025 Romain François`
`2`		`-// Copyright (C) 2026 Romain François and Iñaki Ucar`
	`2`	`+// Copyright (C) 2026 Romain François, Iñaki Ucar and Dirk Eddelbuettel`
`3`	`3`	`//`
`4`	`4`	`// This file is part of Rcpp.`
`5`	`5`	`//`
`@@ -48,7 +48,8 @@ class NamesProxyPolicy{`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`void set(SEXP x) {`
`51`		`- Rf_namesgets(parent, Shield<SEXP>(x));`
	`51`	`+ if (!Rf_isNull(x))`
	`52`	`+ Rf_namesgets(parent, Shield<SEXP>(x));`
`52`	`53`	`}`
`53`	`54`
`54`	`55`	`} ;`