From: Andre Noll <maan@systemlinux.org>
Date: Thu, 31 Jul 2014 06:06:21 +0000 (+0200)
Subject: Merge branch 't/recv_fix'
X-Git-Tag: v0.5.3~6
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=0879c9de4eaf8c78131c243d8e9fec013df0d14a

Merge branch 't/recv_fix'

Cooking for two months.

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

0879c9de4eaf8c78131c243d8e9fec013df0d14a
diff --cc recv.c
index 0d7bb2ce,f28809da..d127882a
--- a/recv.c
+++ b/recv.c
@@@ -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);