OrcLib: CsvFileWriter: call WriteNothing if Write* argument is empty

DFIR-ORC · Nov 9, 2020 · f3cf6af · f3cf6af
1 parent 6fbf7ac
commit f3cf6af
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 6 deletions.
diff --git a/src/OrcLib/CsvFileWriter.cpp b/src/OrcLib/CsvFileWriter.cpp
@@ -917,22 +917,34 @@ STDMETHODIMP Orc::TableOutput::CSV::Writer::WriteXML(const CHAR* szString, DWORD
 
 STDMETHODIMP Orc::TableOutput::CSV::Writer::WriteBytes(const BYTE pBytes[], DWORD dwLen)
 {
-    Buffer<BYTE> buffer;
+    if (dwLen == 0)
+    {
+        return WriteNothing();
+    }
 
+    Buffer<BYTE> buffer;
     buffer.view_of((BYTE*)pBytes, dwLen, dwLen);
 
-    if (auto hr = FormatColumn(buffer); FAILED(hr))
+    HRESULT hr = FormatColumn(buffer);
+    if (FAILED(hr))
     {
         AbandonColumn();
         return hr;
     }
+
     AddColumnAndCheckNumbers();
+
     return S_OK;
 }
 
-STDMETHODIMP Orc::TableOutput::CSV::Writer::WriteBytes(const CBinaryBuffer& Buffer)
+STDMETHODIMP Orc::TableOutput::CSV::Writer::WriteBytes(const CBinaryBuffer& buffer)
 {
-    return WriteBytes(Buffer.GetData(), (DWORD)Buffer.GetCount());
+    if (buffer.empty())
+    {
+        return WriteNothing();
+    }
+
+    return WriteBytes(buffer.GetData(), (DWORD)buffer.GetCount());
 }
 
 Orc::TableOutput::CSV::Writer::~Writer(void)

diff --git a/src/OrcLib/CsvFileWriter.h b/src/OrcLib/CsvFileWriter.h
@@ -114,11 +114,26 @@ class ORCLIB_API Writer
         return WriteColumn(wstr);
     }
 
-    STDMETHOD(WriteString)(const CHAR* szString) override final { return WriteString(std::string_view(szString)); }
+    STDMETHOD(WriteString)(const CHAR* szString) override final
+    {
+        std::string_view s(szString);
+        if (s.empty())
+        {
+            return WriteNothing();
+        }
+
+        return WriteString(s);
+    }
 
     STDMETHOD(WriteCharArray)(const CHAR* szArray, DWORD dwCharCount) override final
     {
-        return WriteString(std::string_view(szArray, dwCharCount));
+        std::string_view s(szArray, dwCharCount);
+        if (s.empty())
+        {
+            return WriteNothing();
+        }
+
+        return WriteString(s);
     }
 
     STDMETHOD(WriteString)(const std::wstring& strString) override final