diff options
| author | Guy Harris <guy@alum.mit.edu> | 2016-12-02 20:08:40 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-12-03 04:09:07 +0000 |
| commit | db7c6286169015a727024e86eb270722127125bb (patch) | |
| tree | 0eb53877ec7a43fe82b276f9c021aa3f75a136ad | |
| parent | 2462f9e8103b23c2728cc5aa84995e0b2f363f12 (diff) | |
Temporarily break up complicated expression into a bunch of separate ifs.
Maybe this way we can identify which *particular* test is, according to
Valgrind, looking at uninitialized data; there's nothing obvious that
shows up from inspecting the code, and neither of our static analyzers
seem to have found anything.
Change-Id: I80f6bb8e6fa92decfe195c01766330b97e980821
Reviewed-on: https://code.wireshark.org/review/19049
Reviewed-by: Guy Harris <guy@alum.mit.edu>
| -rw-r--r-- | epan/dissectors/packet-cops.c | 63 |
1 files changed, 63 insertions, 0 deletions
diff --git a/epan/dissectors/packet-cops.c b/epan/dissectors/packet-cops.c index 280027d796..8bb293d48d 100644 --- a/epan/dissectors/packet-cops.c +++ b/epan/dissectors/packet-cops.c @@ -1086,6 +1086,7 @@ dissect_cops_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data if (nstime_cmp(&pinfo->abs_ts, &cops_call->req_time) <= 0 || cops_call->rsp_num != 0) continue; +#if 0 if ( ( (cops_call->op_code == COPS_MSG_REQ) && (op_code == COPS_MSG_DEC && is_solicited) ) || @@ -1104,6 +1105,68 @@ dissect_cops_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data cops_call->rsp_num = pinfo->num; break; } +#else + if (cops_call->op_code == COPS_MSG_REQ) { + if (op_code == COPS_MSG_DEC) { + if (is_solicited) { + cops_call->rsp_num = pinfo->num; + break; + } + } + } + else if (cops_call->op_code == COPS_MSG_DEC) { + if (op_code == COPS_MSG_RPT) { + if (is_solicited) { + cops_call->rsp_num = pinfo->num; + break; + } + } + else if (op_code == COPS_MSG_DRQ) { + if (is_solicited) { + cops_call->rsp_num = pinfo->num; + break; + } + } + } + else if (cops_call->op_code == COPS_MSG_SSQ) { + if (op_code == COPS_MSG_RPT) { + if (is_solicited) { + cops_call->rsp_num = pinfo->num; + break; + } + } + else if (op_code == COPS_MSG_DRQ) { + if (is_solicited) { + cops_call->rsp_num = pinfo->num; + break; + } + } + else if (op_code == COPS_MSG_SSC) { + cops_call->rsp_num = pinfo->num; + break; + } + } + else if (cops_call->op_code == COPS_MSG_OPN) { + if (op_code == COPS_MSG_CAT) { + cops_call->rsp_num = pinfo->num; + break; + } + else if (op_code == COPS_MSG_CC) { + cops_call->rsp_num = pinfo->num; + break; + } + } + else if (cops_call->op_code == COPS_MSG_KA) { + if (!(cops_call->solicited)) { + if (op_code == COPS_MSG_KA) { + if (is_solicited) { + cops_call->rsp_num = pinfo->num; + break; + } + } + } + } +#endif } } else { |