Fix String Attribute Writes

Used invalid pointer to string array before.
openPMD · Jun 18, 2018 · a8b0fb6 · a8b0fb6
1 parent caba260
commit a8b0fb6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -37,6 +37,7 @@ Bug Fixes
 - recursive directory creation with existing base #261
 - ``FindADIOS.cmake``: reset on multiple calls #263
 - ``SerialIOTest``: remove variable shadowing #262
+- ADIOS1: memory violation in string attribute writes #269
 
 Other
 """""

diff --git a/src/IO/ADIOS/ADIOS1IOHandler.cpp b/src/IO/ADIOS/ADIOS1IOHandler.cpp
@@ -718,7 +718,7 @@ ADIOS1IOHandlerImpl::writeAttribute(Writable* writable,
 
     Attribute att = Attribute(parameters.resource);
 
-    int nelems;
+    int nelems = 0;
     switch( parameters.dtype )
     {
         using DT = Datatype;
@@ -840,9 +840,9 @@ ADIOS1IOHandlerImpl::writeAttribute(Writable* writable,
         }
         case DT::STRING:
         {
-            using uptr = std::unique_ptr< void, std::function< void(void*) > >;
-            values = uptr(const_cast< char* >(att.get< std::string >().c_str()),
-                          [](void*){ });
+            auto const & v = att.get< std::string >();
+            values = auxiliary::allocatePtr(Datatype::CHAR, v.length() + 1u);
+            strcpy((char*)values.get(), v.c_str());
             break;
         }
         case DT::VEC_CHAR:
@@ -977,7 +977,7 @@ ADIOS1IOHandlerImpl::writeAttribute(Writable* writable,
                                             "",
                                             getBP1DataType(parameters.dtype),
                                             nelems,
-                                            values.get());
+                                            values.get()); // Invalid read of size 1 (could be in ADIOS itself?)
     VERIFY(status == err_no_error, "Internal error: Failed to define ADIOS attribute by value");
 
     if( parameters.dtype == Datatype::VEC_STRING )
@@ -1053,9 +1053,9 @@ ADIOS1IOHandlerImpl::readAttribute(Writable* writable,
         attrname += "/";
     attrname += parameters.name;
 
-    ADIOS_DATATYPES datatype;
-    int size;
-    void* data;
+    ADIOS_DATATYPES datatype = adios_unknown;
+    int size = 0;
+    void* data = nullptr;
 
     int status;
     status = adios_get_attr(f,