[Libreoffice-commits] core.git: connectivity/source

[Caolán McNamara (via logerrit)]

 connectivity/source/drivers/dbase/DTable.cxx |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 11ddd00117ad9dd4434b5e057d992f1a2eab49a8
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Sep 23 15:57:23 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Sep 23 18:03:56 2021 +0200

    EOF isn't an error from SvStream::GetError perspective
    
    Change-Id: Ib2bc2c35d78d92728d592676def300e28a8b9e2a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122534
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index 615a52c4a569..6e64c9b39b06 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -301,17 +301,13 @@ void ODbaseTable::fillColumns()
     for (; i < nFieldCount; i++)
     {
         DBFColumn aDBFColumn;
-#if !defined(NDEBUG)
-        sal_uInt64 const nOldPos(m_pFileStream->Tell());
-#endif
         m_pFileStream->ReadBytes(aDBFColumn.db_fnm, 11);
         m_pFileStream->ReadUChar(aDBFColumn.db_typ);
         m_pFileStream->ReadUInt32(aDBFColumn.db_adr);
         m_pFileStream->ReadUChar(aDBFColumn.db_flng);
         m_pFileStream->ReadUChar(aDBFColumn.db_dez);
         m_pFileStream->ReadBytes(aDBFColumn.db_free2, 14);
-        assert(m_pFileStream->GetError() || m_pFileStream->Tell() == nOldPos + sizeof(aDBFColumn));
-        if (m_pFileStream->GetError())
+        if (!m_pFileStream->good())
         {
             SAL_WARN("connectivity.drivers", "ODbaseTable::fillColumns: short read!");
             break;