---

yaml --- r: 64063 b: refs/heads/master c: 465f90a h: refs/heads/master i: 64061: 93fcb4b 64059: 2522656 64055: 3807f83 64047: c0eb277 64031: 027a8c4 63999: 52f3550 v: v3
git-mirror · Aug 14, 2007 · 4805df0 · 4805df0
1 parent 8d3e9c6
commit 4805df0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 35019539d71bacd98de318c34728c97b1b505b49
+refs/heads/master: 465f90a486cd724d364167747e8b8b9f806fa91a
diff --git a/trunk/net/netfilter/nf_conntrack_sip.c b/trunk/net/netfilter/nf_conntrack_sip.c
@@ -330,7 +330,8 @@ int ct_sip_get_info(struct nf_conn *ct,
 
 	while (dptr <= limit) {
 		if ((strncmp(dptr, hnfo->lname, hnfo->lnlen) != 0) &&
-		    (strncmp(dptr, hnfo->sname, hnfo->snlen) != 0)) {
+		    (hnfo->sname == NULL ||
+		     strncmp(dptr, hnfo->sname, hnfo->snlen) != 0)) {
 			dptr++;
 			continue;
 		}