diff options
author | Bart Polot <bart@net.in.tum.de> | 2012-05-08 18:18:21 +0000 |
---|---|---|
committer | Bart Polot <bart@net.in.tum.de> | 2012-05-08 18:18:21 +0000 |
commit | 71c55a1696878c880d63df767a0ce98af23d4d3f (patch) | |
tree | 3f539795dc54d190775361cbeb2c882bc8c87779 /src/testing | |
parent | 8f6277702a38b72d3fa7ba01037ab943375ff2ce (diff) | |
download | gnunet-71c55a1696878c880d63df767a0ce98af23d4d3f.tar.gz gnunet-71c55a1696878c880d63df767a0ce98af23d4d3f.zip |
- fixed memory leaks
Diffstat (limited to 'src/testing')
-rw-r--r-- | src/testing/testing.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/testing/testing.c b/src/testing/testing.c index 4b640c8e5..ffff2ad58 100644 --- a/src/testing/testing.c +++ b/src/testing/testing.c | |||
@@ -362,7 +362,7 @@ start_fsm (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
362 | d->pipe_stdout = NULL; | 362 | d->pipe_stdout = NULL; |
363 | (void) GNUNET_OS_process_kill (d->proc_arm_peerinfo, SIGKILL); | 363 | (void) GNUNET_OS_process_kill (d->proc_arm_peerinfo, SIGKILL); |
364 | GNUNET_break (GNUNET_OK == GNUNET_OS_process_wait (d->proc_arm_peerinfo)); | 364 | GNUNET_break (GNUNET_OK == GNUNET_OS_process_wait (d->proc_arm_peerinfo)); |
365 | GNUNET_OS_process_destroy (d->proc_arm_peerinfo); | 365 | GNUNET_OS_process_destroy (d->proc_arm_peerinfo); |
366 | d->proc_arm_peerinfo = NULL; | 366 | d->proc_arm_peerinfo = NULL; |
367 | if (NULL != cb) | 367 | if (NULL != cb) |
368 | cb (d->cb_cls, NULL, d->cfg, d, _("Failed to get hostkey!\n")); | 368 | cb (d->cb_cls, NULL, d->cfg, d, _("Failed to get hostkey!\n")); |
@@ -504,7 +504,8 @@ start_fsm (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
504 | } | 504 | } |
505 | GNUNET_free_non_null (d->hostname); | 505 | GNUNET_free_non_null (d->hostname); |
506 | GNUNET_free_non_null (d->username); | 506 | GNUNET_free_non_null (d->username); |
507 | GNUNET_free (d->proc_arm_start); | 507 | GNUNET_free_non_null (d->username); |
508 | GNUNET_OS_process_destroy (d->proc_arm_start); | ||
508 | d->proc_arm_start = NULL; | 509 | d->proc_arm_start = NULL; |
509 | d->hostname = NULL; // Quick hack to avoid crashing (testing need to be | 510 | d->hostname = NULL; // Quick hack to avoid crashing (testing need to be |
510 | d->cfg = NULL; // overhauled anyway, and the error managing is | 511 | d->cfg = NULL; // overhauled anyway, and the error managing is |
@@ -521,7 +522,7 @@ start_fsm (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
521 | } | 522 | } |
522 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Successfully started `%s'.\n", | 523 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Successfully started `%s'.\n", |
523 | "gnunet-arm"); | 524 | "gnunet-arm"); |
524 | GNUNET_free (d->proc_arm_start); | 525 | GNUNET_OS_process_destroy (d->proc_arm_start); |
525 | d->proc_arm_start = NULL; | 526 | d->proc_arm_start = NULL; |
526 | d->phase = SP_START_CORE; | 527 | d->phase = SP_START_CORE; |
527 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Calling CORE_connect\n"); | 528 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Calling CORE_connect\n"); |
@@ -627,7 +628,7 @@ start_fsm (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
627 | d->phase = SP_START_DONE; | 628 | d->phase = SP_START_DONE; |
628 | if (NULL != cb) | 629 | if (NULL != cb) |
629 | cb (d->cb_cls, &d->id, d->cfg, d, NULL); | 630 | cb (d->cb_cls, &d->id, d->cfg, d, NULL); |
630 | GNUNET_free (d->proc_arm_srv_start); | 631 | GNUNET_OS_process_destroy (d->proc_arm_srv_start); |
631 | d->proc_arm_srv_start = NULL; | 632 | d->proc_arm_srv_start = NULL; |
632 | break; | 633 | break; |
633 | case SP_SERVICE_SHUTDOWN_START: | 634 | case SP_SERVICE_SHUTDOWN_START: |
@@ -729,8 +730,8 @@ start_fsm (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
729 | GNUNET_free_non_null (d->hostname); | 730 | GNUNET_free_non_null (d->hostname); |
730 | GNUNET_free_non_null (d->username); | 731 | GNUNET_free_non_null (d->username); |
731 | GNUNET_free_non_null (d->shortname); | 732 | GNUNET_free_non_null (d->shortname); |
732 | // GNUNET_free_non_null (d->proc); // !? FIXME! | 733 | GNUNET_OS_process_destroy (d->proc_arm_stop); |
733 | // d->proc = NULL; // !? FIXME! | 734 | d->proc_arm_stop = NULL; |
734 | GNUNET_free (d); | 735 | GNUNET_free (d); |
735 | return; | 736 | return; |
736 | } | 737 | } |
@@ -765,8 +766,8 @@ start_fsm (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
765 | GNUNET_free_non_null (d->hello); | 766 | GNUNET_free_non_null (d->hello); |
766 | d->hello = NULL; | 767 | d->hello = NULL; |
767 | GNUNET_free_non_null (d->shortname); | 768 | GNUNET_free_non_null (d->shortname); |
768 | // GNUNET_free_non_null (d->proc); // !? FIXME | 769 | GNUNET_OS_process_destroy (d->proc_arm_stop); |
769 | // d->proc = NULL; // !? FIXME! | 770 | d->proc_arm_stop = NULL; |
770 | d->shortname = NULL; | 771 | d->shortname = NULL; |
771 | if (d->churn == GNUNET_NO) | 772 | if (d->churn == GNUNET_NO) |
772 | GNUNET_free (d); | 773 | GNUNET_free (d); |