Fix UBSAN warning in ldat

djvanderlaan · May 23, 2018 · e749996 · e749996
1 parent e2914c9
commit e749996
Show file tree

Hide file tree

Showing 20 changed files with 17 additions and 35 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: lvec
 Type: Package
 Title: Out of Memory Vectors
-Version: 0.2.1
-Date: 2018-05-15
+Version: 0.2.2
+Date: 2018-05-23
 Author: Jan van der Laan
 Maintainer: Jan van der Laan <djvanderlaan@unrealizedtime.nl>
 Description: Core functionality for working with vectors (numeric, integer,

diff --git a/inst/include/tempfile.h b/inst/include/tempfile.h
@@ -9,7 +9,7 @@
 inline std::string tempfile() {
   static std::string(*fun)() = NULL;
   if (fun == NULL)
-    fun = (std::string(*)()) R_GetCCallable("lvec", "tempfile");
+    fun = (std::string(*)()) R_GetCCallable("lvec", "tempfile_impl");
   return fun();
 }
 

diff --git a/src/as_lvec.cpp b/src/as_lvec.cpp
@@ -1,4 +1,3 @@
-#include "../inst/include/lvec.h"
 #include "r_export.h"
 #include <cstring>
 

diff --git a/src/as_rvec.cpp b/src/as_rvec.cpp
@@ -1,5 +1,3 @@
-#include "../inst/include/lvec.h"
-
 #include "r_export.h"
 #include <cstring>
 

diff --git a/src/assign.cpp b/src/assign.cpp
@@ -1,4 +1,3 @@
-#include "../inst/include/lvec.h"
 #include "r_export.h"
 
 class assign_visitor : public ldat::lvec_visitor {

diff --git a/src/assign_range.cpp b/src/assign_range.cpp
@@ -1,4 +1,3 @@
-#include "../inst/include/lvec.h"
 #include "r_export.h"
 
 class assign_range_visitor : public ldat::lvec_visitor {

diff --git a/src/clone.cpp b/src/clone.cpp
@@ -1,4 +1,3 @@
-#include "../inst/include/lvec.h"
 #include "r_export.h"
 
 RcppExport SEXP lclone(SEXP rv) {

diff --git a/src/construct.cpp b/src/construct.cpp
@@ -1,4 +1,3 @@
-#include "../inst/include/lvec.h"
 #include "r_export.h"
 
 RcppExport SEXP new_lvec(SEXP rsize, SEXP rtype, SEXP rstrlen) {

diff --git a/src/get_type.cpp b/src/get_type.cpp
@@ -1,4 +1,3 @@
-#include "../inst/include/lvec.h"
 #include "r_export.h"
 
 class type_visitor : public ldat::lvec_visitor {

diff --git a/src/indexing.cpp b/src/indexing.cpp
@@ -1,4 +1,3 @@
-#include "../inst/include/lvec.h"
 #include "r_export.h"
 #include <memory>
 

diff --git a/src/indexing_range.cpp b/src/indexing_range.cpp
@@ -1,6 +1,5 @@
-#include "../inst/include/lvec.h"
-#include <memory>
 #include "r_export.h"
+#include <memory>
 
 class range_indexing_visitor : public ldat::lvec_visitor {
   public: 

diff --git a/src/lvec-init.cpp b/src/lvec-init.cpp
@@ -1,10 +1,8 @@
-#include "tempfile.h"
-#include "../inst/include/lvec.h"
 #include "r_export.h"
+#include "tempfile_impl.h"
 
 #include <R_ext/Rdynload.h>
 
-
 #define CALLDEF(name, n)  {#name, (DL_FUNC) &name, n}
 
 extern "C" {
@@ -29,7 +27,7 @@ extern "C" {
   };
 
   void R_init_lvec(DllInfo *info) {
-    R_RegisterCCallable("lvec", "tempfile",  (DL_FUNC) &tempfile);
+    R_RegisterCCallable("lvec", "tempfile_impl",  (DL_FUNC) &tempfile_impl);
     R_registerRoutines(info, NULL, r_calldef, NULL, NULL);
     R_useDynamicSymbols(info, static_cast<Rboolean>(FALSE));
   }

diff --git a/src/order.cpp b/src/order.cpp
@@ -1,4 +1,3 @@
-#include "../inst/include/lvec.h"
 #include "r_export.h"
 
 #include <algorithm>

diff --git a/src/r_export.h b/src/r_export.h
@@ -1,5 +1,4 @@
-#include "../inst/include/cppr.h"
-#include "../inst/include/lvec.h"
+#include "../inst/include/lvec_interface.h"
 
 extern "C" {
   SEXP as_lvec(SEXP rv);

diff --git a/src/size.cpp b/src/size.cpp
@@ -1,4 +1,3 @@
-#include "../inst/include/lvec.h"
 #include "r_export.h"
 
 RcppExport SEXP get_size(SEXP rv) {

diff --git a/src/sort.cpp b/src/sort.cpp
@@ -1,4 +1,3 @@
-#include "../inst/include/lvec.h"
 #include "r_export.h"
 
 #include <algorithm>

diff --git a/src/strlen.cpp b/src/strlen.cpp
@@ -1,4 +1,3 @@
-#include "../inst/include/lvec.h"
 #include "r_export.h"
 
 class strlen_visitor : public ldat::lvec_visitor {

diff --git a/src/tempfile.h b/src/tempfile.h
diff --git a/src/tempfile.cpp → src/tempfile_impl.cpp b/src/tempfile.cpp → src/tempfile_impl.cpp
@@ -1,10 +1,9 @@
-#include "tempfile.h"
-#include "../inst/include/cppr.h"
 #include "r_export.h"
+#include "tempfile_impl.h"
 
 std::string tempdir = ".";
 
-std::string tempfile() {
+std::string tempfile_impl() {
   char* p = R_tmpnam("lvec", tempdir.c_str());
   std::string res{p};
   free(p);

diff --git a/src/tempfile_impl.h b/src/tempfile_impl.h
@@ -0,0 +1,8 @@
+#ifndef tempfile_impl_h
+#define tempfile_impl_h
+
+#include <string>
+
+std::string tempfile_impl();
+
+#endif