Merge branch 'proctect' into cran-2.6-6

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: vegan
 Title: Community Ecology Package
-Version: 2.6-6
+Version: 2.6-6.1
 Authors@R: c(person("Jari", "Oksanen", role=c("aut","cre"),
                     email="[email protected]"),
 	   person("Gavin L.", "Simpson", role="aut",

inst/NEWS.md

@@ -1,5 +1,11 @@
 ## vegan News
 
+### Changes in version 2\.6-6\.1
+
+* C function `do_wcentre` (weighted centring) can segfault due to a
+  protection error. The problem was found in automatic CRAN checks and
+  the fix was verified in Tomas Kalibera's docker container.
+
 ### Changes in version 2\.6-6
 
 #### INSTALLATION

src/goffactor.c

@@ -78,12 +78,14 @@ SEXP do_wcentre(SEXP x, SEXP w)
 	error("weights 'w' and data do not match");
     if (TYPEOF(x) != REALSXP)
 	x  = coerceVector(x, REALSXP);
+    PROTECT(x);
     SEXP rx = PROTECT(duplicate(x));
     if (TYPEOF(w) != REALSXP)
 	w = coerceVector(w, REALSXP);
-    w = PROTECT(duplicate(w));
+    PROTECT(w);
+    SEXP rw = PROTECT(duplicate(w));
     SEXP retx = PROTECT(allocMatrix(REALSXP, nr, nc));
-    wcentre(REAL(rx), REAL(retx), REAL(w), &nr, &nc);
+    wcentre(REAL(rx), REAL(retx), REAL(rw), &nr, &nc);
     /* set dimnames */
     SEXP dnames = getAttrib(x, R_DimNamesSymbol);
     if (!isNull(dnames)) {
@@ -93,7 +95,7 @@ SEXP do_wcentre(SEXP x, SEXP w)
         setAttrib(retx, R_DimNamesSymbol, dimnames);
         UNPROTECT(1);
     }
-    UNPROTECT(3);
+    UNPROTECT(5);
     return retx;
 }