fix problems uncovered by rchk

Author: kingaa

src/dmeasure.c

@@ -19,7 +19,9 @@ static R_INLINE SEXP add_args
   // 'log', covariates, parameter, states, observables, then time
 
   // 'log' is a needed argument
-  PROTECT(args = LCONS(AS_LOGICAL(log),VectorToPairList(args)));
+  PROTECT(log = AS_LOGICAL(log));
+  PROTECT(args = VectorToPairList(args));
+  PROTECT(args = LCONS(log,args));
   SET_TAG(args,install("log"));
 
   // Covariates
@@ -65,7 +67,7 @@ static R_INLINE SEXP add_args
   PROTECT(args);
   SET_TAG(args,install("t"));
 
-  UNPROTECT(1);
+  UNPROTECT(3);
   return args;
 
 }

src/dprior.c

@@ -13,7 +13,9 @@ static R_INLINE SEXP add_args (SEXP names, SEXP log, SEXP args)
   SEXP var;
   int v;
 
-  PROTECT(args = LCONS(AS_LOGICAL(log),VectorToPairList(args)));
+  PROTECT(log = AS_LOGICAL(log));
+  PROTECT(args = VectorToPairList(args));
+  PROTECT(args = LCONS(log,args));
   SET_TAG(args,install("log"));
 
   for (v = LENGTH(names)-1; v >= 0; v--) {
@@ -24,7 +26,7 @@ static R_INLINE SEXP add_args (SEXP names, SEXP log, SEXP args)
     SET_TAG(args,installChar(STRING_ELT(names,v)));
   }
 
-  UNPROTECT(1);
+  UNPROTECT(3);
   return args;
 
 }

src/dprocess.c

@@ -8,18 +8,25 @@
 #include "internal.h"
 
 static R_INLINE SEXP paste0 (SEXP a, SEXP b) {
-  return eval(lang3(install("paste0"),a,b),R_BaseEnv);
+  SEXP p, v;
+  PROTECT(p = lang3(install("paste0"),a,b));
+  PROTECT(v = eval(p,R_BaseEnv));
+  UNPROTECT(2);
+  return v;
 }
 
 static R_INLINE SEXP add_args (SEXP args, SEXP Snames, SEXP Pnames, SEXP Cnames)
 {
 
   SEXP S1names, S2names;
+  SEXP s1, s2;
   SEXP var;
   int v;
 
-  PROTECT(S1names = paste0(Snames,mkString("_1")));
-  PROTECT(S2names = paste0(Snames,mkString("_2")));
+  PROTECT(s1 = mkString("_1"));
+  PROTECT(s2 = mkString("_2"));
+  PROTECT(S1names = paste0(Snames,s1));
+  PROTECT(S2names = paste0(Snames,s2));
 
   PROTECT(args = VectorToPairList(args));
 
@@ -71,7 +78,7 @@ static R_INLINE SEXP add_args (SEXP args, SEXP Snames, SEXP Pnames, SEXP Cnames)
   PROTECT(args);
   SET_TAG(args,install("t_1"));
 
-  UNPROTECT(3);
+  UNPROTECT(5);
   return args;
 
 }

src/rinit.c

@@ -8,7 +8,11 @@
 #include "internal.h"
 
 static R_INLINE SEXP paste0 (SEXP a, SEXP b, SEXP c) {
-  return eval(lang4(install("paste0"),a,b,c),R_BaseEnv);
+  SEXP p, v;
+  PROTECT(p = lang4(install("paste0"),a,b,c));
+  PROTECT(v = eval(p,R_BaseEnv));
+  UNPROTECT(2);
+  return v;
 }
 
 static SEXP pomp_default_rinit(SEXP params, SEXP Pnames,
@@ -223,12 +227,13 @@ SEXP do_rinit (SEXP object, SEXP params, SEXP t0, SEXP nsim, SEXP gnsi)
 
     if (nsims > 1) {
       int k, *sp;
-
+      SEXP us;
+      PROTECT(us = mkString("_"));
       PROTECT(xn = NEW_INTEGER(ns));
       for (k = 0, sp = INTEGER(xn); k < ns; k++, sp++) *sp = (k/nrep)+1;
-      PROTECT(xn = paste0(pcnames,mkString("_"),xn));
+      PROTECT(xn = paste0(pcnames,us,xn));
       PROTECT(dn = GET_DIMNAMES(x));
-      nprotect += 3;
+      nprotect += 4;
       SET_ELEMENT(dn,1,xn);
       SET_DIMNAMES(x,dn);