From 624b0785dd8e8ba4dc9a0969fdf6dd8f51251b66 Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel@holtmann.org>
Date: Fri, 28 Dec 2012 15:35:10 -0800
Subject: [PATCH] monitor: Fix handling of unknown L2CAP options

---
 monitor/l2cap.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/monitor/l2cap.c b/monitor/l2cap.c
index beb949525..7602673de 100644
--- a/monitor/l2cap.c
+++ b/monitor/l2cap.c
@@ -433,9 +433,15 @@ static void print_config_options(const struct l2cap_frame *frame,
 
 		print_field("Option: %s (0x%2.2x)", str, type);
 
+		if (expect_len == 0) {
+			consumed += 2;
+			break;
+		}
+
 		if (len != expect_len) {
 			print_text(COLOR_ERROR, "wrong option size (%d != %d)",
 							len, expect_len);
+			consumed += 2;
 			break;
 		}
 
-- 
2.47.3