[postgis-tickets] [SCM] PostGIS branch master updated. 3.3.0alpha1-71-g6c5acf038

[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  6c5acf038ebf4b3c720d8a2cfdb5991fb9aa78eb (commit)
       via  aa4a545566dbbed40f492e27b3a9c8f630a78a13 (commit)
      from  e140c4c84ca5b968cdb436aabc5d3e9146d20242 (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 6c5acf038ebf4b3c720d8a2cfdb5991fb9aa78eb
Merge: 08dcf2aa5 aa4a54556
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Thu Jun 16 07:34:07 2022 -0700

    Merge branch 'lbartoletti-fix_cutpaste_isinstdportalcache'


commit aa4a545566dbbed40f492e27b3a9c8f630a78a13
Author: Loïc Bartoletti <loic.bartoletti at oslandia.com>
Date:   Thu Jun 16 12:48:55 2022 +0200

    std_pg_hash.c: fix cut/paste in IsInStdPortalCache
    
    ci->lextab is tested 3 times. I guess it's a cut/paste mistake and
    should be replaced by the two other variables ci->gaztab and ci->rultab.

diff --git a/extensions/address_standardizer/std_pg_hash.c b/extensions/address_standardizer/std_pg_hash.c
index 06907af0f..f98ae4e9b 100644
--- a/extensions/address_standardizer/std_pg_hash.c
+++ b/extensions/address_standardizer/std_pg_hash.c
@@ -226,8 +226,8 @@ IsInStdPortalCache(StdPortalCache *STDCache,  char *lextab, char *gaztab, char *
     for (i=0; i<STD_CACHE_ITEMS; i++) {
         StdCacheItem *ci = &STDCache->StdCache[i];
         if (ci->lextab && !strcmp(ci->lextab, lextab) &&
-            ci->lextab && !strcmp(ci->gaztab, gaztab) &&
-            ci->lextab && !strcmp(ci->rultab, rultab))
+            ci->gaztab && !strcmp(ci->gaztab, gaztab) &&
+            ci->rultab && !strcmp(ci->rultab, rultab))
                 return TRUE;
     }
 

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

Summary of changes:
 extensions/address_standardizer/std_pg_hash.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
PostGIS