v1.1.6 to CRAN

gagolews · Nov 10, 2017 · 64651ed · 64651ed
1 parent b14c034
commit 64651ed
Show file tree

Hide file tree

Showing 9 changed files with 192 additions and 43 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: stringi
 Version: 1.1.6
-Date: 2017-11-06
+Date: 2017-11-10
 Title: Character String Processing Facilities
 Description: Allows for fast, correct, consistent, portable,
     as well as convenient character string/text processing in every locale

diff --git a/NEWS b/NEWS
@@ -1,10 +1,7 @@
                    stringi package NEWS and CHANGELOG
 ===============================================================================
 
-## 1.1.6 (on the way)
-
-* @TODO:........[GENERAL] #69: `stringi` is now bundled with ICU4C 59.1.
-update to ICU 59 if c++11, stay ICU 55 on Solaris #193
+## 1.1.6 (2017-11-10) **CRAN**
 
 * [WINDOWS SPECIFIC] #270: Strings marked with `latin1` encoding
 are now converted internally to UTF-8 using the WINDOWS-1252 codec.
@@ -13,14 +10,11 @@ This fixes problems with - among others - displaying the Euro sign.
 * [NEW FEATURE] #263: Add support for custom rule-based break iteration,
 see `?stri_opts_brkiter`.
 
-* emojis......
-
-* stri_width for emojis....
-
 * [NEW FEATURE] #267: `omit_na=TRUE` in `stri_sub<-` now ignores missing values
 in any of the arguments provided.
 
-* t.b.d.
+* [BUGFIX] fixed unPROTECTed variable names and stack imbalances
+as reported by rchk
 
 -------------------------------------------------------------------------------
 

diff --git a/devel/testthat/test-prepare-arguments.R b/devel/testthat/test-prepare-arguments.R
@@ -35,6 +35,7 @@ suppressWarnings(test_that("stri_prepare_arg_string", {
    expect_identical(stringi:::stri_prepare_arg_string(list(1, 2, 3)), as.character(list(1, 2, 3)))
    expect_identical(stringi:::stri_prepare_arg_string(data.frame(1, 2, 3)), as.character(data.frame(1, 2, 3)))
 
+
 }))
 
 suppressWarnings(test_that("stri_prepare_arg_double", {
@@ -126,7 +127,7 @@ suppressWarnings(test_that("stri_prepare_arg_double_1", {
    #suppressWarnings(stringi:::stri_prepare_arg_double_1(character(0)))
    suppressWarnings(expect_equivalent(stringi:::stri_prepare_arg_double_1(1:5),1))
    suppressWarnings(expect_equivalent(stringi:::stri_prepare_arg_double_1(1.5:5),1.5))
-   suppressWarnings(expect_equivalent(stringi:::stri_prepare_arg_double_1(as.factor(1:5)),1))
+   suppressWarnings(expect_equivalent(stringi:::stri_prepare_arg_double_1(as.factor(10+1:5)),10+1))
 
 
    suppressWarnings(expect_error(stringi:::stri_prepare_arg_double_1(NULL)))

diff --git a/src/stri_collator.cpp b/src/stri_collator.cpp
@@ -61,6 +61,9 @@
  *
  * @version 0.4-1 (Marek Gagolewski, 2014-12-08)
  *    #23: add `overlap` option
+ *
+ * @version 1.1.6 (Marek Gagolewski, 2017-11-10)
+ *    PROTECT STRING_ELT(names, i)
  */
 UCollator* stri__ucol_open(SEXP opts_collator)
 {
@@ -96,7 +99,7 @@ UCollator* stri__ucol_open(SEXP opts_collator)
       if (STRING_ELT(names, i) == NA_STRING)
          Rf_error(MSG__INCORRECT_COLLATOR_OPTION_SPEC); // error() allowed here
 
-      const char* curname = CHAR(STRING_ELT(names, i));
+      const char* curname = stri__copy_string_Ralloc(STRING_ELT(names, i), "curname");  /* this is R_alloc'ed */
       if (!strcmp(curname, "locale")) {
          opt_LOCALE = stri__prepare_arg_locale(VECTOR_ELT(opts_collator, i), "locale", true); /* this is R_alloc'ed */
       } else if  (!strcmp(curname, "strength")) {

diff --git a/src/stri_container_bytesearch.cpp b/src/stri_container_bytesearch.cpp
@@ -385,6 +385,9 @@ StriByteSearchMatcher* StriContainerByteSearch::getMatcher(R_len_t i) {
  *
  * @version 0.4-1 (Marek Gagolewski, 2014-12-08)
  *    add `overlap` option
+ *
+ * @version 1.1.6 (Marek Gagolewski, 2017-11-10)
+ *    PROTECT STRING_ELT(names, i)
  */
 uint32_t StriContainerByteSearch::getByteSearchFlags(SEXP opts_fixed, bool allow_overlap)
 {
@@ -404,8 +407,7 @@ uint32_t StriContainerByteSearch::getByteSearchFlags(SEXP opts_fixed, bool allow
          if (STRING_ELT(names, i) == NA_STRING)
             Rf_error(MSG__FIXED_CONFIG_FAILED); // error() call allowed here
 
-         const char* curname = CHAR(STRING_ELT(names, i));
-
+         const char* curname = stri__copy_string_Ralloc(STRING_ELT(names, i), "curname");  /* this is R_alloc'ed */
          if  (!strcmp(curname, "case_insensitive")) {
             bool val = stri__prepare_arg_logical_1_notNA(VECTOR_ELT(opts_fixed, i), "case_insensitive");
             if (val) flags |= BYTESEARCH_CASE_INSENSITIVE;

diff --git a/src/stri_container_regex.cpp b/src/stri_container_regex.cpp
@@ -140,6 +140,9 @@ RegexMatcher* StriContainerRegexPattern::getMatcher(R_len_t i)
  *
  * @version 0.3-1 (Marek Gagolewski, 2014-11-05)
  *    Disallow NA options
+ *
+ * @version 1.1.6 (Marek Gagolewski, 2017-11-10)
+ *    PROTECT STRING_ELT(names, i)
  */
 uint32_t StriContainerRegexPattern::getRegexFlags(SEXP opts_regex)
 {
@@ -159,8 +162,7 @@ uint32_t StriContainerRegexPattern::getRegexFlags(SEXP opts_regex)
          if (STRING_ELT(names, i) == NA_STRING)
             Rf_error(MSG__REGEXP_CONFIG_FAILED); // error() call allowed here
 
-         const char* curname = CHAR(STRING_ELT(names, i));
-
+         const char* curname = stri__copy_string_Ralloc(STRING_ELT(names, i), "curname");  /* this is R_alloc'ed */
          if  (!strcmp(curname, "case_insensitive")) {
             bool val = stri__prepare_arg_logical_1_notNA(VECTOR_ELT(opts_regex, i), "case_insensitive");
             if (val) flags |= UREGEX_CASE_INSENSITIVE;