---

yaml --- r: 46011 b: refs/heads/master c: adcb471 h: refs/heads/master i: 46009: c97a479 46007: 259453d v: v3
git-mirror · Jan 30, 2007 · 81bc313 · 81bc313
1 parent 2b0deaf
commit 81bc313
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7da5bfbb12e327b3a347ee3e076957cd6564eb56
+refs/heads/master: adcb4711101dfef89d473f64a913089d303962ae
diff --git a/trunk/net/ipv4/netfilter/ip_conntrack_sip.c b/trunk/net/ipv4/netfilter/ip_conntrack_sip.c
@@ -292,7 +292,7 @@ static int skp_epaddr_len(const char *dptr, const char *limit, int *shift)
 		dptr++;
 	}
 
-	if (*dptr == '@') {
+	if (dptr <= limit && *dptr == '@') {
 		dptr++;
 		(*shift)++;
 	} else

diff --git a/trunk/net/netfilter/nf_conntrack_sip.c b/trunk/net/netfilter/nf_conntrack_sip.c
@@ -312,7 +312,7 @@ static int skp_epaddr_len(struct nf_conn *ct, const char *dptr,
 		dptr++;
 	}
 
-	if (*dptr == '@') {
+	if (dptr <= limit && *dptr == '@') {
 		dptr++;
 		(*shift)++;
 	} else
-Original file line number
+Diff line change
@@ Expand Up @@
     		dptr++;
     	}
-    	if (*dptr == '@') {
+    	if (dptr <= limit && *dptr == '@') {
     		dptr++;
     		(*shift)++;
     	} else
@@ Expand Down @@