fixup null terminating strings 2

Author: runette

source/pdal/pdalc_pipeline.cpp

@@ -115,8 +115,10 @@ extern "C"
 
                 std::stringstream strm;
                 pdal::PipelineWriter::writePipeline(ptr->manager->getStage(), strm);
-                strm.get(buffer, size);
-                return std::min(static_cast<size_t>(strm.gcount()), size);
+                std::string out = strm.str();
+                if (out.length() > size - 1) out.resize(size - 1);
+                std::strncpy(buffer, out.c_str(), size);
+                return std::min(out.length() + 1, size);
             }
             catch (const std::exception &e)
             {
@@ -141,8 +143,10 @@ extern "C"
                 std::stringstream strm;
                 MetadataNode root = ptr->manager->getMetadata().clone("metadata");
                 pdal::Utils::toJSON(root, strm);
-                strm.get(metadata, size);
-                return std::min(static_cast<size_t>(strm.gcount()), size);
+                std::string out = strm.str();
+                if (out.length() > size - 1) out.resize(size - 1);
+                std::strncpy(metadata, out.c_str(), size);
+                return std::min(out.length() + 1, size);
             }
             catch (const std::exception &e)
             {
@@ -165,8 +169,10 @@ extern "C"
                 MetadataNode meta = ptr->manager->pointTable().layout()->toMetadata();
                 MetadataNode root = meta.clone("schema");
                 pdal::Utils::toJSON(root, strm);
-                strm.get(schema, size);
-                return std::min(static_cast<size_t>(strm.gcount()), size);
+                std::string out = strm.str();
+                if (out.length() > size - 1) out.resize(size - 1);
+                std::strncpy(schema, out.c_str(), size);
+                return std::min(out.length() + 1, size);
             }
             catch (const std::exception &e)
             {

tests/pdal/test_pdalc_pipeline.c.in

@@ -146,6 +146,23 @@ TEST testPDALGetPipelineAsString(void)
         FAILm("PDALGetPipelineMetadata generated a JSON string whose object name is not \"pipeline\"");
     }
 
+    char json10[10];
+    size = PDALGetPipelineAsString(pipeline, json10, 10);
+
+    if (size != 10 )
+    {
+        PDALDisposePipeline(pipeline);
+        pipeline = NULL;
+        FAILm("PDALGetPipelineAsString truncation not working");
+    }
+
+    if (json[0] == '\0')
+    {
+        PDALDisposePipeline(pipeline);
+        pipeline = NULL;
+        FAILm("PDALGetPipelineAsString generated a JSON string whose first character is null");
+    }
+
     PDALDisposePipeline(pipeline);
     PASS();
 }
@@ -200,6 +217,16 @@ TEST testPDALGetPipelineMetadata(void)
         FAILm("PDALGetPipelineMetadata generated a JSON string whose object name is not \"schema\"");
     }
 
+    char json10[10];
+    size = PDALGetPipelineMetadata(pipeline, json10, 10);
+
+    if (size != 10 )
+    {
+        PDALDisposePipeline(pipeline);
+        pipeline = NULL;
+        FAILm("PDALGetPipelineMetadata truncation not working");
+    }
+
     PDALDisposePipeline(pipeline);
     PASS();
 }
@@ -254,6 +281,16 @@ TEST testPDALGetPipelineSchema(void)
         FAILm("PDALGetPipelineSchema generated a JSON string whose object name is not \"schema\"");
     }
 
+    char json10[10];
+    size = PDALGetPipelineSchema(pipeline, json10, 10);
+
+    if (size != 10 )
+    {
+        PDALDisposePipeline(pipeline);
+        pipeline = NULL;
+        FAILm("PDALGetPipelineSchema truncation not working");
+    }
+
     PDALDisposePipeline(pipeline);
     PASS();
 }