aboutsummaryrefslogtreecommitdiff
path: root/src/fs/fs_file_information.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2013-09-11 22:45:57 +0000
committerChristian Grothoff <christian@grothoff.org>2013-09-11 22:45:57 +0000
commite695e63169a4d0da7ab2fe77c59ac2ca29e443d1 (patch)
treec6dab890be90cc16258a76b77ec71533af49bcee /src/fs/fs_file_information.c
parente0bf5085a192fe5e9ba401ea7bc62f304c370c4d (diff)
downloadgnunet-e695e63169a4d0da7ab2fe77c59ac2ca29e443d1.tar.gz
gnunet-e695e63169a4d0da7ab2fe77c59ac2ca29e443d1.zip
-do not clean up reader more than once
Diffstat (limited to 'src/fs/fs_file_information.c')
-rw-r--r--src/fs/fs_file_information.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/fs/fs_file_information.c b/src/fs/fs_file_information.c
index 7726fc7d9..3e6d53af6 100644
--- a/src/fs/fs_file_information.c
+++ b/src/fs/fs_file_information.c
@@ -426,8 +426,11 @@ GNUNET_FS_file_information_destroy (struct GNUNET_FS_FileInformation *fi,
426 else 426 else
427 { 427 {
428 /* call clean-up function of the reader */ 428 /* call clean-up function of the reader */
429 if (fi->data.file.reader != NULL) 429 if (NULL != fi->data.file.reader)
430 fi->data.file.reader (fi->data.file.reader_cls, 0, 0, NULL, NULL); 430 {
431 (void) fi->data.file.reader (fi->data.file.reader_cls, 0, 0, NULL, NULL);
432 fi->data.file.reader = NULL;
433 }
431 /* clean up client-info */ 434 /* clean up client-info */
432 if (NULL != cleaner) 435 if (NULL != cleaner)
433 cleaner (cleaner_cls, fi, fi->data.file.file_size, fi->meta, 436 cleaner (cleaner_cls, fi, fi->data.file.file_size, fi->meta,
@@ -446,7 +449,7 @@ GNUNET_FS_file_information_destroy (struct GNUNET_FS_FileInformation *fi,
446 if (NULL != fi->meta) 449 if (NULL != fi->meta)
447 GNUNET_CONTAINER_meta_data_destroy (fi->meta); 450 GNUNET_CONTAINER_meta_data_destroy (fi->meta);
448 GNUNET_free_non_null (fi->serialization); 451 GNUNET_free_non_null (fi->serialization);
449 if (fi->te != NULL) 452 if (NULL != fi->te)
450 { 453 {
451 GNUNET_FS_tree_encoder_finish (fi->te, NULL, NULL); 454 GNUNET_FS_tree_encoder_finish (fi->te, NULL, NULL);
452 fi->te = NULL; 455 fi->te = NULL;