fix #5586

diff --git a/src/fs/fs.conf.in b/src/fs/fs.conf.in
index 92bcf776db0475f57472969615e394164524a6da..bd1d04001f0a00eac1a538fc75c7f03a7c915b4e 100644 (file)
--- a/src/fs/fs.conf.in
+++ b/src/fs/fs.conf.in
@@ -11,6 +11,8 @@ BINARY = gnunet-service-fs
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
 
+# PREFIX = valgrind
+
 # Do we introduce artificial delays? (may improve anonymity)
 DELAY = YES
 
@@ -58,6 +60,7 @@ DISABLE_ANON_TRANSFER = NO
 # well anyway, so better have a moderate cap.
 MAX_CADET_CLIENTS = 128
 
+PREFIX = valgrind
 
 [gnunet-auto-share]
 BINARY = gnunet-auto-share

diff --git a/src/fs/gnunet-service-fs_cadet_client.c b/src/fs/gnunet-service-fs_cadet_client.c
index 61f73a50a4af0a5125ce7432667e9b18ae6e5f6c..e6ece4346f1902b4b2a7428a0ef12ee826074eb3 100644 (file)
--- a/src/fs/gnunet-service-fs_cadet_client.c
+++ b/src/fs/gnunet-service-fs_cadet_client.c
@@ -11,7 +11,7 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
@@ -741,7 +741,12 @@ GSF_cadet_release_clients (void *cls,
              "Timeout on cadet channel to %s\n",
              GNUNET_i2s (&mh->target));
   if (NULL != mh->channel)
-    GNUNET_CADET_channel_destroy (mh->channel);
+  {
+    struct GNUNET_CADET_Channel *channel = mh->channel;
+
+    mh->channel = NULL;
+    GNUNET_CADET_channel_destroy (channel);
+  }
   return GNUNET_YES;
 }