---

yaml --- r: 143954 b: refs/heads/master c: 29fe1b4 h: refs/heads/master v: v3
git-mirror · Apr 22, 2009 · fd9cc7b · fd9cc7b
1 parent 0328d98
commit fd9cc7b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cc29c70dd581f85ee7a3e7980fb031f90b90a2ab
+refs/heads/master: 29fe1b481283a1bada994a69f65736db4ae6f35f
diff --git a/trunk/net/netfilter/nf_conntrack_netlink.c b/trunk/net/netfilter/nf_conntrack_netlink.c
@@ -988,7 +988,7 @@ ctnetlink_change_helper(struct nf_conn *ct, struct nlattr *cda[])
 {
 	struct nf_conntrack_helper *helper;
 	struct nf_conn_help *help = nfct_help(ct);
-	char *helpname;
+	char *helpname = NULL;
 	int err;
 
 	/* don't change helper of sibling connections */
@@ -1231,7 +1231,7 @@ ctnetlink_create_conntrack(struct nlattr *cda[],
 
 	rcu_read_lock();
  	if (cda[CTA_HELP]) {
- 		char *helpname;
+		char *helpname = NULL;
 
  		err = ctnetlink_parse_help(cda[CTA_HELP], &helpname);
  		if (err < 0)