Merge branch 'cherry-pick-963e6a8c' into 'run2-patches'

Fix write beyond array bound

See merge request !506

Phys/DecayTreeTupleTracking/src/TupleToolConeIsolation.cpp

@@ -198,7 +198,8 @@ warning()<< m_MergedPizerosLocation << " Not available"<<endmsg;
         verbose() << "Filling variables with conesize " << coneSize << endmsg;
 
       // -- Convert the conesize to a string
-      char coneNumber[4];
+      // -- Convert the conesize to a string (and don't forget space for the terminating '\0'!)
+      char coneNumber[5];
       sprintf( coneNumber, "%.2f", coneSize );
       std::string conesize( coneNumber );
 

Phys/DecayTreeTupleTracking/src/TupleToolTrackIsolation.cpp

@@ -133,8 +133,8 @@ StatusCode TupleToolTrackIsolation::fill( const LHCb::Particle *top,
       double deltaPhi = fabs(part->momentum().Phi() - momentumInCone.Phi());
       if(deltaPhi > M_PI) deltaPhi  = 2*M_PI-deltaPhi;
 
-      // -- Convert the conesize to a string
-      char coneNumber[4];
+      // -- Convert the conesize to a string (and don't forget the space for the terminating '\0'!)
+      char coneNumber[5];
       sprintf(coneNumber, "%.2f", coneSizeCounter);
       std::string conesize(coneNumber);