OSDN Git Service
(root)
/
android-x86
/
external-bluetooth-bluez.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fb2e295
)
monitor: Fix handling of unknown L2CAP options
author
Marcel Holtmann
<marcel@holtmann.org>
Fri, 28 Dec 2012 23:35:10 +0000
(15:35 -0800)
committer
Marcel Holtmann
<marcel@holtmann.org>
Fri, 28 Dec 2012 23:35:10 +0000
(15:35 -0800)
monitor/l2cap.c
patch
|
blob
|
history
diff --git
a/monitor/l2cap.c
b/monitor/l2cap.c
index
beb9495
..
7602673
100644
(file)
--- 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;
}