[postgis-tickets] [SCM] PostGIS branch master updated. 595f840ebc479657adac9143cfaf890faba72f99

[git at osgeo.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "PostGIS".

The branch, master has been updated
       via  595f840ebc479657adac9143cfaf890faba72f99 (commit)
      from  42dd04bb15fd9fc42b0a8d5a226e2aa6e3375554 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 595f840ebc479657adac9143cfaf890faba72f99
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Tue Dec 3 13:06:25 2019 -0800

    Harmonize with old behaviour.
    This is probably not ideal, the old behaviour is pretty
    weird, and works by coincidence. The main problem is the
    regression test files with no attributes, which are DBF files
    with no entries in them, sitting next to SHP files that have
    entries. There's no 1:1 row match any more. Things like
    checking for deleted records don't work. On the other hand
    it looks like it's not possible to have a shape file that
    has no attributes.

diff --git a/loader/dbfopen.c b/loader/dbfopen.c
index 32d11a0..f21c161 100644
--- a/loader/dbfopen.c
+++ b/loader/dbfopen.c
@@ -1750,7 +1750,7 @@ int SHPAPI_CALL DBFIsRecordDeleted( DBFHandle psDBF, int iShape )
 /* -------------------------------------------------------------------- */
 /*	Have we read the record?					*/
 /* -------------------------------------------------------------------- */
-    if( !DBFLoadRecord( psDBF, iShape ) )
+    if( psDBF->nRecords > 0 && !DBFLoadRecord( psDBF, iShape ) )
         return FALSE;
 
 /* -------------------------------------------------------------------- */

-----------------------------------------------------------------------

Summary of changes:
 loader/dbfopen.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
PostGIS