Blame SOURCES/wireshark-1.10.0-CVE-2013-3557.patch
|
 |
affdba |
diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c
|
|
|
affdba |
index 7dcfd42..adf01bd 100644
|
|
|
affdba |
--- a/epan/dissectors/packet-ber.c
|
|
|
affdba |
+++ b/epan/dissectors/packet-ber.c
|
|
|
affdba |
@@ -3503,6 +3503,10 @@ printf("CHOICE dissect_ber_old_choice(%s) entered len:%d\n", name, tvb_length_re
|
|
|
affdba |
#endif
|
|
|
affdba |
start_offset = offset;
|
|
|
affdba |
|
|
|
affdba |
+ if (branch_taken) {
|
|
|
affdba |
+ *branch_taken = -1;
|
|
|
affdba |
+ }
|
|
|
affdba |
+
|
|
|
affdba |
if (tvb_length_remaining(tvb, offset) == 0) {
|
|
|
affdba |
item = proto_tree_add_string_format(
|
|
|
affdba |
parent_tree, hf_ber_error, tvb, offset, 0, "empty_choice",
|
|
|
affdba |
@@ -3545,9 +3549,6 @@ printf("CHOICE dissect_ber_old_choice(%s) entered len:%d\n", name, tvb_length_re
|
|
|
affdba |
/* loop over all entries until we find the right choice or
|
|
|
affdba |
run out of entries */
|
|
|
affdba |
ch = choice;
|
|
|
affdba |
- if (branch_taken) {
|
|
|
affdba |
- *branch_taken = -1;
|
|
|
affdba |
- }
|
|
|
affdba |
first_pass = TRUE;
|
|
|
affdba |
while (ch->func || first_pass) {
|
|
|
affdba |
if (branch_taken) {
|