Count correct number of items in indef sequence-of and set-of.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@26451 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 6 insertions, 0 deletions

diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c
index 91cf571bb0..ade78fd215 100644
--- a/epan/dissectors/packet-ber.c
+++ b/epan/dissectors/packet-ber.c
@@ -3273,6 +3273,9 @@ printf("SQ OF dissect_ber_sq_of(%s) entered\n",name);
 	 */
 	/* XXX Do we really need to count them at all ?  ronnie */
 	if(tvb_length_remaining(tvb, offset)==tvb_reported_length_remaining(tvb, offset)){
+		if (ind) {
+			cnt--;  /* don't count EOC as an item */
+		}
 		while (offset < end_offset){
 			guint32 len;
                         gint s_offset;
@@ -3480,6 +3483,9 @@ printf("SQ OF dissect_ber_old_sq_of(%s) entered\n",name);
 	 */
 	/* XXX Do we really need to count them at all ?  ronnie */
 	if(tvb_length_remaining(tvb, offset)==tvb_reported_length_remaining(tvb, offset)){
+		if (ind) {
+			cnt--;  /* don't count EOC as an item */
+		}
 		while (offset < end_offset){
 			guint32 len;
                         gint s_offset;