From 81bc31318de2551333b1fd266d8b53a1e2a3a214 Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Tue, 30 Jan 2007 14:25:24 -0800 Subject: [PATCH] --- yaml --- r: 46011 b: refs/heads/master c: adcb4711101dfef89d473f64a913089d303962ae h: refs/heads/master i: 46009: c97a479eac85166477bbed33ba8decb86b7bfed3 46007: 259453d8609b0d432cc84be5a5dadfa4c43ddb04 v: v3 --- [refs] | 2 +- trunk/net/ipv4/netfilter/ip_conntrack_sip.c | 2 +- trunk/net/netfilter/nf_conntrack_sip.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 61ffcd87f3c5..aa98041a5146 100644 --- 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 index 571d27e20910..11c588a10e6b 100644 --- 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 index c93fb37a54fc..9dec11534678 100644 --- 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