diff --git a/[refs] b/[refs]
index 715ae2a6e74d..092f9305341b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7185989db4d926dbef1a2f638c464f35599c83e0
+refs/heads/master: 4d942d8b39bf7d43ce93d85964aeb63aeace0593
diff --git a/trunk/net/ipv4/netfilter/ip_conntrack_helper_h323_asn1.c b/trunk/net/ipv4/netfilter/ip_conntrack_helper_h323_asn1.c
index 5d04438dda4b..26dfecadb335 100644
--- a/trunk/net/ipv4/netfilter/ip_conntrack_helper_h323_asn1.c
+++ b/trunk/net/ipv4/netfilter/ip_conntrack_helper_h323_asn1.c
@@ -555,7 +555,7 @@ int decode_seq(bitstr_t * bs, field_t * f, char *base, int level)
 
 	/* Decode the extension components */
 	for (opt = 0; opt < bmp2_len; opt++, i++, son++) {
-		if (son->attr & STOP) {
+		if (i < f->ub && son->attr & STOP) {
 			PRINT("%*.s%s\n", (level + 1) * TAB_SIZE, " ",
 			      son->name);
 			return H323_ERROR_STOP;