Fix issue with read_dta crashing R (#619)

And empty string instead of NA string for empty StrL variables Fixes #594. Fixes #600. Fixes #608.
tidyverse · Jul 26, 2021 · 078dd6b · 078dd6b
1 parent 260d2c2
commit 078dd6b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/NEWS.md b/NEWS.md
@@ -1,5 +1,8 @@
 # haven (development version)
 
+* Fix issue with `read_dta()` crashing R when StrL variables with missing values
+  were present (@gorcha, #594, #600, #608).
+
 * The buglet fixed in 2.4.1 when combining `labelled()` with identical labels
 has been fixed in `labelled_spss()` (@gorcha, #599).
 

diff --git a/src/DfReader.cpp b/src/DfReader.cpp
@@ -354,15 +354,18 @@ class DfReader {
     case READSTAT_TYPE_STRING:
     {
       cpp11::writable::strings col(output_[var_index]);
+      const char* str_value = readstat_string_value(value);
 
       if (readstat_value_is_tagged_missing(value)) {
         col[obs_index] = NA_STRING;
       } else if (!user_na_ && readstat_value_is_defined_missing(value, variable)) {
         col[obs_index] = NA_STRING;
       } else if (readstat_value_is_system_missing(value)) {
         col[obs_index] = NA_STRING;
+      } else if (str_value == NULL) {
+        col[obs_index] = cpp11::r_string("");
       } else {
-        col[obs_index] = cpp11::r_string(readstat_string_value(value));
+        col[obs_index] = cpp11::r_string(str_value);
       }
       break;
     }