fix oglin(, param = TRUE) in some corner cases

git-svn-id: https://svn.r-project.org/R/trunk@87480 00db46b3-68df-0310-9c12-caf00c1e9a41

Author: ripley

doc/NEWS.Rd

@@ -490,7 +490,13 @@
       \item Silent integer overflow could occur in the
        \sQuote{exact} computations for \code{fisher.test()} for
        unrealistic inputs: this is now an error.
-    }
+
+       \item Some inalid C-level memory accesses are avoided for
+       \code{loglin(, margin = NULL)}.
+
+       \code{loglin(, param = TRUE)} no longer gives an eror in corner
+       cases such as a one-dimensional input.
+     }
   }
 }
 

src/library/stats/R/loglin.R

@@ -113,19 +113,21 @@ loglin <- function(table, margin, start = rep(1, length(table)), fit =
         parnam[1L] <- "(Intercept)"
         fit <- fit - parval[[1L]]
 
-        ## Get the u_i(B) in the rows of 'dyadic', see above.
-        dyadic <- NULL
-        while(any(terms > 0)) {
-            dyadic <- cbind(dyadic, terms %% 2)
-            terms <- terms %/% 2
-        }
-        dyadic <- dyadic[order(rowSums(dyadic)), , drop = FALSE]
-
-        for (i in 2 : parlen) {
-            vars <- which(dyadic[i - 1, ] > 0)
-            parval[[i]] <- apply(fit, vars, mean)
-            parnam[i] <- paste(varnames[vars], collapse = ".")
-            fit <- sweep(fit, vars, parval[[i]], check.margin=FALSE)
+        if(parlen > 1) {
+            ## Get the u_i(B) in the rows of 'dyadic', see above.
+            dyadic <- NULL
+            while(any(terms > 0)) {
+                dyadic <- cbind(dyadic, terms %% 2)
+                terms <- terms %/% 2
+            }
+            dyadic <- dyadic[order(rowSums(dyadic)), , drop = FALSE]
+
+            for (i in 2 : parlen) {
+                vars <- which(dyadic[i - 1, ] > 0)
+                parval[[i]] <- apply(fit, vars, mean)
+                parnam[i] <- paste(varnames[vars], collapse = ".")
+                fit <- sweep(fit, vars, parval[[i]], check.margin=FALSE)
+            }
         }
 
         names(parval) <- parnam