diff options
author | Guy Harris <guy@alum.mit.edu> | 2016-06-11 18:59:25 -0700 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2016-06-12 01:59:54 +0000 |
commit | 24f02dafcd80a10558bf5afeed07a0989a6d7cc6 (patch) | |
tree | f8c040d6f41a60db18444eada5496c8461500871 /ui/qt/tcp_stream_dialog.cpp | |
parent | 4cab0516cc1108b2a9538702ea105bb6053a425f (diff) |
Add checks to address setting routines.
Fail if:
1) you have an AT_NONE address with data;
2) you have a non-AT_NONE address with a zero length and a
non-null data pointer, or with a non-zero length and a null
data pointer.
When comparing addresses for equality, just make sure the types are the
same, the lengths are the same and, if the lengths are non-zero, the
data is the same; don't treat AT_NONE specially - the "lengths are
non-zero" check will make sure we do the right thing.
Make sure when we create an AT_NONE address it has a zero length and
null data pointer.
Change-Id: I5c452ef0d140c2d9aef3004f1cfd124a95b78fb2
Reviewed-on: https://code.wireshark.org/review/15839
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'ui/qt/tcp_stream_dialog.cpp')
-rw-r--r-- | ui/qt/tcp_stream_dialog.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/qt/tcp_stream_dialog.cpp b/ui/qt/tcp_stream_dialog.cpp index f8b04cd715..507bd4bc8f 100644 --- a/ui/qt/tcp_stream_dialog.cpp +++ b/ui/qt/tcp_stream_dialog.cpp @@ -1083,8 +1083,8 @@ void TCPStreamDialog::on_streamNumberSpinBox_valueChanged(int new_stream) { if (new_stream >= 0 && new_stream < int(get_tcp_stream_count())) { graph_.stream = new_stream; - graph_.src_address.type = AT_NONE; - graph_.dst_address.type = AT_NONE; + clear_address(&graph_.src_address); + clear_address(&graph_.dst_address); findStream(); fillGraph(); } |