Fix for malicious optimisation of memcpy in test suite, which causes failure with...

diff --git a/changelog b/changelog
index a3e7dbb79796210bb867b0243c12bd2885e10539..fedd31a545455b6e584cce04511c91d1503b744f 100644 (file)
--- a/changelog
+++ b/changelog
@@ -1,6 +1,8 @@
 adns (1.5.1~~) unstable; urgency=low
 
   * Portability fix for systems where socklen_t is bigger than int.
 adns (1.5.1~~) unstable; urgency=low
 
   * Portability fix for systems where socklen_t is bigger than int.

+  * Fix for malicious optimisation of memcpy in test suite, which
+    causes failure with gcc-4.1.9 -O3.  See Debian bug #772718.

 
  --
 
 
  --
 

diff --git a/regress/hcommon.c b/regress/hcommon.c
index ebbef9400e4d361dc96c24cbabe2dcec6d54fd33..e63a8cda57a0b30d40aefdc87c7bb5f46ef64e06 100644 (file)
--- a/regress/hcommon.c
+++ b/regress/hcommon.c
@@ -281,7 +281,7 @@ void *Hrealloc(void *op, size_t nsz) {
   size_t osz;
   if (op) { oldnode= (void*)((char*)op - MALLOCHSZ); osz= oldnode->sz; } else { osz= 0; }
   np= Hmalloc(nsz);
   size_t osz;
   if (op) { oldnode= (void*)((char*)op - MALLOCHSZ); osz= oldnode->sz; } else { osz= 0; }
   np= Hmalloc(nsz);

-  memcpy(np,op, osz>nsz ? nsz : osz);
+  if (osz) memcpy(np,op, osz>nsz ? nsz : osz);

   Hfree(op);
   return np;
 }
   Hfree(op);
   return np;
 }

diff --git a/regress/hcommon.c.m4 b/regress/hcommon.c.m4
index c5069ee14ff7866504ec6222a154af4968724c33..330da4d2e9d27a4dcbebe342b15c7ae2a06ccb7d 100644 (file)
--- a/regress/hcommon.c.m4
+++ b/regress/hcommon.c.m4
@@ -301,7 +301,7 @@ void *Hrealloc(void *op, size_t nsz) {
 
   if (op) { oldnode= (void*)((char*)op - MALLOCHSZ); osz= oldnode->sz; } else { osz= 0; }
   np= Hmalloc(nsz);
 
   if (op) { oldnode= (void*)((char*)op - MALLOCHSZ); osz= oldnode->sz; } else { osz= 0; }
   np= Hmalloc(nsz);

-  memcpy(np,op, osz>nsz ? nsz : osz);
+  if (osz) memcpy(np,op, osz>nsz ? nsz : osz);

   Hfree(op);
   return np;
 }
   Hfree(op);
   return np;
 }