Avoid accessing invalid memory in base/utilities_pack_unpack_04

diff --git a/tests/base/utilities_pack_unpack_04.cc b/tests/base/utilities_pack_unpack_04.cc
index 5c9a74f86048d0edf8833d2d81580b8f1a2b97f2..3546ec90fa3b4329da1a052d12bd24b9d82f9d5a 100644 (file)
--- a/tests/base/utilities_pack_unpack_04.cc
+++ b/tests/base/utilities_pack_unpack_04.cc
@@ -34,8 +34,10 @@ void check (const T (&object)[N])
   T unpacked[N];
   Utilities::unpack(buffer, unpacked);
 
-  deallog << "Buffer size check: " << (buffer.size() == sizeof(T)*N ? "OK" : "Failed") << std::endl;
-  deallog << "memcmp check: " << (std::memcmp(buffer.data(), &object, buffer.size()) == 0 ? "OK" : "Failed") << std::endl;
+  const bool equal_sizes = (buffer.size() == sizeof(T)*N);
+  deallog << "Buffer size check: " << (equal_sizes ? "OK" : "Failed") << std::endl;
+  if (equal_sizes)
+    deallog << "memcmp check: " << (std::memcmp(buffer.data(), &object, buffer.size()) == 0 ? "OK" : "Failed") << std::endl;
 
   bool equal=true;
   for (unsigned int i=0; i<N; ++i)

diff --git a/tests/base/utilities_pack_unpack_04.output b/tests/base/utilities_pack_unpack_04.output
index a4b19aca522936a56856483d94ff13301525a836..32ca1ae80622a939a59e228ca25fbf4a136dfbd6 100644 (file)
--- a/tests/base/utilities_pack_unpack_04.output
+++ b/tests/base/utilities_pack_unpack_04.output
@@ -3,6 +3,5 @@ DEAL::Buffer size check: OK
 DEAL::memcmp check: OK
 DEAL::direct cmp: OK
 DEAL::Buffer size check: Failed
-DEAL::memcmp check: Failed
 DEAL::direct cmp: OK
 DEAL::OK!