version 2.1.19

Author: viking

COPYING

@@ -1,7 +1,8 @@
 R YAML package
 ==============
 
-Copyright (c) 2008-2017 Vanderbilt University
+Copyright (c) 2008-2016 Vanderbilt University
+Copyright (c) 2016-2018 Vanderbilt University Medical Center
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are

DESCRIPTION

@@ -1,16 +1,19 @@
 Package: yaml
 Type: Package
 Title: Methods to Convert R Data to YAML and Back
-Version: 2.1.18
-Date: 2018-03-08
+Version: 2.1.19
+Date: 2018-04-30
 Suggests: testthat
-Author: Jeremy Stephens <[email protected]>
-Maintainer: Jeremy Stephens <[email protected]>
+Author: Jeremy Stephens [aut, cre], Kirill Simonov [aut], Yihui Xie [ctb],
+  Zhuoer Dong [ctb], Hadley Wickham [ctb], Jeffrey Horner [ctb], reikoch [ctb],
+  Will Beasley [ctb], Brendan O'Connor [ctb], Gregory R. Warnes [ctb]
+Maintainer: Jeremy Stephens <[email protected]>
 License: BSD_3_clause + file LICENSE
-Description: Implements the 'libyaml' 'YAML' 1.1 parser and emitter (<http://pyyaml.org/wiki/LibYAML>) for R.
+Description: Implements the 'libyaml' 'YAML' 1.1 parser and emitter
+  (<http://pyyaml.org/wiki/LibYAML>) for R.
 URL: https://github.com/viking/r-yaml/
 BugReports: https://github.com/viking/r-yaml/issues
 NeedsCompilation: yes
-Packaged: 2018-03-08 17:16:23 UTC; stephej1
+Packaged: 2018-04-30 20:56:56 UTC; stephej1
 Repository: CRAN
-Date/Publication: 2018-03-08 22:39:53 UTC
+Date/Publication: 2018-05-01 10:38:53 UTC

LICENSE

@@ -1,3 +1,3 @@
-YEAR: 2008-2017
-COPYRIGHT HOLDER: Jeremy Stephens
-ORGANIZATION: Vanderbilt University
+YEAR: 2008-2018
+COPYRIGHT HOLDER: Vanderbilt University Medical Center
+ORGANIZATION: Vanderbilt University Medical Center

MD5

@@ -1,31 +1,31 @@
-fa09576f1a178d6bbbed0a3a7c6658a9 *COPYING
-f1cc0da1fdfdd9c478ee6854736a3f97 *DESCRIPTION
-e58fbacdb9cfed939f4fd9b0d15f0bee *LICENSE
+bbba10d958545e3425cc20f316d9da75 *COPYING
+d440e0a33f696add5c278b305e61f52d *DESCRIPTION
+98b6f1d7e7a36de0353698db9027b614 *LICENSE
 17a16244d43d0cfe5439535f4695dd7f *NAMESPACE
 05097eadb441a850accca52b62df4211 *R/as.yaml.R
 2e2a7e7cf24956e202fc4c73bad09b90 *R/read_yaml.R
 41bba07a114c49bbdfe2b025403c89c0 *R/write_yaml.R
-b653b0cb420b4bc3f8e383c6dda1f26e *R/yaml.load.R
-1bc20160ad6346c041afb31e52ae4ad9 *R/yaml.load_file.R
+788be5758ce0fe969bd86b74f66bb11a *R/yaml.load.R
+363c5793776f7b432b777ecf3966d950 *R/yaml.load_file.R
 59d3ef441a03e63a67784ef7d111f8fe *R/zzz.R
-ace3f4e4c2bbe092a3c16a19e14f0597 *inst/CHANGELOG
-7fdf90be17ac849a6d21e83b76dfe6b8 *inst/THANKS
+635f5da6234f5b2358f1353156ff2b36 *inst/CHANGELOG
+f0a1646d0486e242e59e280cd842ae0d *inst/THANKS
 05861435cf308c70a8b7ba94fce61b8e *inst/implicit.re
 916e622be973c8ce2802a10976986ee9 *man/as.yaml.Rd
 a0d39a7ef9c9a3c2c5a3da0d2982e82b *man/read_yaml.Rd
 33e7e0b96f6aa83e85b13ede97212e9c *man/write_yaml.Rd
-e9c3e4d68ceaba9ce1c312c698c394be *man/yaml.load.Rd
+dbcccec0abd20440d047fbc8b94e873e *man/yaml.load.Rd
 6b0576349be43cf3d872205b41aff77d *src/Makevars
 55dfab3483ed1c7b2729f54ecb7d6079 *src/api.c
 fc3b40e7be71bf6c15fc119275f1c13d *src/dumper.c
 9c1a8f3fe9933a2c0bbb2152cfb6d3ee *src/emitter.c
 600ca8f17e1da02d661b336c6cd146bf *src/implicit.c
 c3ea5a68879f54f058c8bbfed18c55a0 *src/loader.c
 1a16662902d2e63e2af2470d0fe43794 *src/parser.c
-83a329ea074ab5d64e4b541545070bbb *src/r_emit.c
-a53c7b0c9cc17310ccb136459e81a37b *src/r_ext.c
-6bdfcb1b72ad3aeb3840781dbeed244f *src/r_ext.h
-639889e0f52d98aac2ed289ed41988f0 *src/r_parse.c
+b2fc52128050eea1e0a41e7a1805a8fb *src/r_emit.c
+7b6ed96ece58d8f8aecf4e725dbc587d *src/r_ext.c
+19e8716a3ff790a2f66859b58f19572e *src/r_ext.h
+3821f2c36959664e164242bbcc19c739 *src/r_parse.c
 095b4acfce41313fe01603812558230f *src/reader.c
 965007c37e953ccbcf0227b1d18552a3 *src/scanner.c
 ede6fecf08c77109b81f1054d4224a91 *src/writer.c
@@ -36,5 +36,5 @@ b70b0ade3126a031e5bf77d8aa9af4f2 *tests/testthat/files/test.yml
 12bc0646a0b62b994326688ccfcda5bd *tests/testthat/test_as_yaml.R
 fa1d250548643d2b2f69d3e15a396c94 *tests/testthat/test_read_yaml.R
 f38e5ea44a7a4e631bbd4ee15e8d5173 *tests/testthat/test_write_yaml.R
-5907343860e9f0ffd03620121fe16434 *tests/testthat/test_yaml_load.R
-0ef8c9da21dc10d06f9eae16894a1601 *tests/testthat/test_yaml_load_file.R
+4de5edd83c780d479f86e597cf3f4641 *tests/testthat/test_yaml_load.R
+5430539a598e9a8845b172bd0ded71d7 *tests/testthat/test_yaml_load_file.R

R/yaml.load.R

@@ -1,5 +1,6 @@
 `yaml.load` <-
-function(string, as.named.list = TRUE, handlers = NULL, error.label = NULL) {
+function(string, as.named.list = TRUE, handlers = NULL, error.label = NULL, eval.expr = getOption("yaml.eval.expr", TRUE)) {
+  eval.warning <- missing(eval.expr) && is.null(getOption("yaml.eval.expr"))
   string <- enc2utf8(paste(string, collapse = "\n"))
-  .Call(C_unserialize_from_yaml, string, as.named.list, handlers, error.label, PACKAGE="yaml")
+  .Call(C_unserialize_from_yaml, string, as.named.list, handlers, error.label, eval.expr, eval.warning, PACKAGE="yaml")
 }

R/yaml.load_file.R

@@ -11,8 +11,11 @@ function(input, error.label, ...) {
     else if (is.character(input) && nzchar(input[1])) {
       error.label <- input[1]
     }
+    else {
+      error.label <- NULL
+    }
   }
-  
+
   if (is.character(input)) {
     con <- file(input, encoding = 'UTF-8')
     on.exit(close(con), add = TRUE)

inst/CHANGELOG

@@ -1,5 +1,11 @@
+v2.1.19
+  - fix unserialization issues with int#base60 tag (reported by Nancy Irisarri)
+  - add eval.expr option to yaml.load function
+  - fix issue with error.label argument (patch by Gregory R. Warnes)
+  - fix a few garbage collection protection issues
+
 v2.1.18
-  - fix protection stack bugs (bug reported by Rich FitzJohn)
+  - fix protection stack bugs (reported by Rich FitzJohn)
 
 v2.1.17
   - rewrite parsing functionality using pairlists instead of a self-managed

inst/THANKS

@@ -8,3 +8,4 @@ Patches submitted by:
 - Hadley Wickham (867d1b0)
 - Will Beasley (edefae9)
 - Zhuoer Dong (8febaba..28c89f4, 0e34af1)
+- Gregory R. Warnes (e3bf914)

man/yaml.load.Rd

@@ -7,16 +7,18 @@
   Parse a YAML string and return R objects.
 }
 \usage{
-  yaml.load(string, as.named.list = TRUE, handlers = NULL, error.label = NULL)
+  yaml.load(string, as.named.list = TRUE, handlers = NULL, error.label = NULL,
+            eval.expr = getOption("yaml.eval.expr", TRUE))
   yaml.load_file(input, error.label, ...)
 }
 %- maybe also 'usage' for other objects documented here.
 \arguments{
   \item{string}{ the YAML string to be parsed }
   \item{as.named.list}{ whether or not to return a named list for maps (TRUE by default) }
-  \item{handlers}{ named list of custom handler functions for YAML types (see Details). }
-  \item{input}{ a filename or connection. If \code{input} is a filename, that file must be encoded in UTF-8. }
-  \item{error.label}{ a label to prepend to error messages (see Details). }
+  \item{handlers}{ named list of custom handler functions for YAML types (see Details) }
+  \item{input}{ a filename or connection; if \code{input} is a filename, that file must be encoded in UTF-8 }
+  \item{error.label}{ a label to prepend to error messages (see Details) }
+  \item{eval.expr}{ whether or not to evaluate expressions found in the YAML document (see Details) }
   \item{...}{ arguments to pass to yaml.load }
 }
 \details{
@@ -49,6 +51,15 @@
   connection object (via the \code{summary} function).  You can explicity set
   \code{error.label} to \code{NULL} if you don't want to use this functionality.
 
+  There is a built-in handler that will evaluate expressions that are tagged
+  with the \sQuote{!expr} tag.  Currently this handler is enabled by default,
+  but the handler is being disabled by default in an upcoming version for
+  safety and security reasons.  If you do not explicity set the
+  \code{eval.expr} argument to \code{TRUE}, you will get a warning if an
+  expression is evaluated.  Alternately, you can set the option named
+  \sQuote{yaml.eval.expr} via the \code{options} function to turn off the
+  warning.
+
   This function uses the YAML parser provided by libyaml, which conforms to the YAML 1.1
   specification.
 }