Changeset 29081 for main/trunk/greenstone2/common-src

Timestamp:

2014-05-29T11:22:00+12:00 (10 years ago)

Author:

kjdon

Message:

memcpy not safe for copying in overlapping areas, use memmove instead. Thanks to Michael from DL Consulting for debugging this

File:

• main/trunk/greenstone2/common-src/indexers/mgpp/lib/perf_hash.cpp (modified) (2 diffs)

main/trunk/greenstone2/common-src/indexers/mgpp/lib/perf_hash.cpp

@@ -743 +743 @@
   make_trans_func (num, keys);
 
-  if (r <= 0)
+  if (r <= 0) 
     SEED_RANDOM ((mg_s_long) time ((time_t *) NULL));
-  else
+  else 
     SEED_RANDOM (r);
-
+  
   MAX_M = num + 1;
 
@@ -767 +767 @@
     return (NULL);
 
-  memcpy ((void *) g, (const void *) &g[1], n * sizeof (int));
+  // use memmove not memcpy as memory areas are overlapping
+  memmove ((void *) g, (const void *) &g[1], n * sizeof (int));
 
   phd->MAX_L = MAX_L;