2 files changed, 2 insertions, 1 deletions
diff --git a/lldb/include/lldb/lldb-forward.h b/lldb/include/lldb/lldb-forward.h
index 48e0afb0555..e45f4de2286 100644
--- a/lldb/include/lldb/lldb-forward.h
+++ b/lldb/include/lldb/lldb-forward.h
@@ -62,6 +62,7 @@ class   ConstString;
 class   DWARFCallFrameInfo;
 class   DWARFExpression;
 class   DataBuffer;
+class   DataEncoder;
 class   DataExtractor;
 class   Debugger;
 class   Declaration;
diff --git a/lldb/source/Core/DataEncoder.cpp b/lldb/source/Core/DataEncoder.cpp
index d0740af8f47..933cc3eb23b 100644
--- a/lldb/source/Core/DataEncoder.cpp
+++ b/lldb/source/Core/DataEncoder.cpp
@@ -356,6 +356,6 @@ uint32_t
 DataEncoder::PutCString (uint32_t offset, const char *cstr)
 {
     if (cstr)
-        return PutData (offset, cstr, strlen(cstr));
+        return PutData (offset, cstr, strlen(cstr) + 1);
     return UINT32_MAX;
 }