Changeset 42694

Timestamp:

Jun 24, 2024, 8:57:54 AM (2 years ago)

Author:

eugene

Message:

avoid a memory corruption problem caused by not skipping unmatched secfilt entries

Location:

branches/eam_branches/ipp-20230313/Ohana/src/dvomerge/src

Files:

• dvomergeUpdate_catalogs.c (modified) (1 diff)
• merge_catalogs_old.c (modified) (1 diff)

branches/eam_branches/ipp-20230313/Ohana/src/dvomerge/src/dvomergeUpdate_catalogs.c

@@ -2 +2 @@
 # define DEBUG 1
 # define MACHINE_GROUPS 1
+# define MEMCHECK_VERBOSE 0
 
 // in parallel mode, the target database may be distributed, while the input database is

branches/eam_branches/ipp-20230313/Ohana/src/dvomerge/src/merge_catalogs_old.c

@@ -497 +497 @@
       int outputIndex;
       if (secfiltMap) {
+        if (secfiltMap[j] < 0) continue;  // skip secfilt entries from input that are not in the output
         outputIndex = (Nave * NsecfiltOut) + secfiltMap[j];
       } else {