]> Pileus Git - ~andy/linux/blobdiff - net/netfilter/nf_conntrack_netlink.c
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
[~andy/linux] / net / netfilter / nf_conntrack_netlink.c
index fd77619256a82975c6af8175967dab084d9b57c9..c523f0b8cee53bd9e304af4db77a4a474c44bcbe 100644 (file)
@@ -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 */
@@ -1209,7 +1209,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)