]> git.tuebingen.mpg.de Git - paraslash.git/commitdiff
Merge branch 't/recv_fix'
authorAndre Noll <maan@systemlinux.org>
Thu, 31 Jul 2014 06:06:21 +0000 (08:06 +0200)
committerAndre Noll <maan@systemlinux.org>
Thu, 31 Jul 2014 06:06:21 +0000 (08:06 +0200)
Cooking for two months.

* t/recv_fix:
  recv: Don't segfault on invalid chunk values.

1  2 
recv.c

diff --combined recv.c
index 0d7bb2ce3ce0c8133cd120ebb36f23e0d3e88b71,f28809da6c2b8c5b03f975e940cbe61cbdd4b27c..d127882a8e02d72219140325460fd73d9e050794
--- 1/recv.c
--- 2/recv.c
+++ b/recv.c
@@@ -1,5 -1,5 +1,5 @@@
  /*
 - * Copyright (C) 2005-2013 Andre Noll <maan@systemlinux.org>
 + * Copyright (C) 2005-2014 Andre Noll <maan@systemlinux.org>
   *
   * Licensed under the GPL v2. For licencing details see COPYING.
   */
@@@ -63,9 -63,8 +63,9 @@@ int main(int argc, char *argv[]
        int ret, r_opened = 0, receiver_num;
        struct receiver *r = NULL;
        struct receiver_node rn;
-       struct stdout_task sot;
+       struct stdout_task sot = {.btrn = NULL};
        static struct sched s;
 +      struct task_info ti;
  
        recv_cmdline_parser(argc, argv, &conf);
        loglevel = get_loglevel_by_name(conf.loglevel_arg);
  
        sot.btrn = btr_new_node(&(struct btr_node_description)
                EMBRACE(.parent = rn.btrn, .name = "stdout"));
 -      stdout_set_defaults(&sot);
 -      register_task(&s, &sot.task);
 +      stdout_task_register(&sot, &s);
  
 -      rn.task.pre_select = r->pre_select;
 -      rn.task.post_select = r->post_select;
 -      sprintf(rn.task.status, "%s", r->name);
 -      register_task(&s, &rn.task);
 +      ti.name = r->name;
 +      ti.pre_select = r->pre_select;
 +      ti.post_select = r->post_select;
 +      ti.context = &rn;
 +      rn.task = task_register(&ti, &s);
  
        s.default_timeout.tv_sec = 1;
        s.default_timeout.tv_usec = 0;
        ret = schedule(&s);
 +      sched_shutdown(&s);
  out:
        if (r_opened)
                r->close(&rn);