Size of data should include null terminator (#60)

RuntimeTools · Oct 23, 2017 · 5a2361b · 5a2361b
1 parent e30bf90
commit 5a2361b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/src/cpuplugin/cpuplugin.cpp b/src/cpuplugin/cpuplugin.cpp
@@ -172,7 +172,8 @@ agentCoreFunctions CpuPlugin::aCF;
 			AppendCPUTime(contentss);
 
 			std::string content = contentss.str();
-			data->size = static_cast<uint32>(content.length()); // should data->size be a size_t?
+			uint32 cSize = static_cast<uint32>(content.length() + 1);  // +1 to include null terminator
+			data->size = cSize; // should data->size be a size_t?
 			data->data = NewCString(content);
 		} else {
 			if (!IsValidData(instance->current)) {

diff --git a/src/envplugin/envplugin.cpp b/src/envplugin/envplugin.cpp
@@ -169,7 +169,8 @@ monitordata* EnvPlugin::OnRequestData() {
 	AppendSystemInfo(contentss);
 
 	std::string content = contentss.str();
-	data->size = static_cast<uint32>(content.length()); // should data->size be a size_t?
+	uint32 cSize = static_cast<uint32>(content.length() + 1);  // +1 to include null terminator
+	data->size = cSize; // should data->size be a size_t?
 	data->data = NewCString(content);
 	data->persistent = false;
 	aCF.logMessage(debug, "<<<EnvPlugin::OnRequestData");

diff --git a/src/memplugin/MemoryPlugin.cpp b/src/memplugin/MemoryPlugin.cpp
@@ -231,8 +231,8 @@ monitordata* MemoryPlugin::OnRequestData() {
 	if (sval) {
 		strcpy(sval, memorydata.c_str());
 
-		data->size = len;
 		data->data = sval;
+		data->size = len + 1;  // +1 to include null terminator
 
 	}
 	aCF.logMessage(debug, "<<<MemoryPlugin::OnRequestData");