Backported LOFAR-Release-4_1 patches resulting from the rollout.

CMake/variants/variants.cbm206

@@ -11,7 +11,7 @@ option(USE_LOG4CPLUS "Use Log4Cplus" ON)
 option(USE_MPI       "Use MPI"       ON)
 
 set(CASACORE_ROOT_DIR /opt/casacore/3.0.0)
-set(DAL_ROOT_DIR      /opt/DAL/3.3.1)
+set(DAL_ROOT_DIR      /opt/DAL/3.3.2)
 set(BLITZ_ROOT_DIR    /opt/blitz/1.0.1)
 
 # MPI_ROOT_DIR does not need to be specified, because it can just be found thanks to the usage of mpi-selector

CMake/variants/variants.head01

 set(CASACORE_ROOT_DIR /opt/casacore-v3.0.0)
-set(DAL_ROOT_DIR      /opt/DAL-v3.3.1)
+set(DAL_ROOT_DIR      /opt/DAL-v3.3.2)

RTCP/Cobalt/CoInterface/src/Allocator.cc

@@ -120,6 +120,10 @@ namespace LOFAR
     {
       ScopedLock sl(mutex);
 
+      // if we allocate 0 bytes, we could end up returning the same pointer for a subsequent allocation.
+      // since allocations with 0 bytes shouldn't be dereferenced anyway, we return NULL.
+      if (size == 0) return 0;
+
       // look for a free range large enough
       for (SparseSet<void *>::const_iterator it = freeList.getRanges().begin(); it != freeList.getRanges().end(); it++) {
         void *begin = align(it->begin, alignment);

RTCP/Cobalt/GPUProc/src/Station/StationInput.cc

@@ -454,6 +454,7 @@ namespace LOFAR {
             //copyRSPTimer.stop();
 
             outputQueue.append(rspData);
+            rspData.reset();
             ASSERT(!rspData);
           }
         }