osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

There's no need to check the return from g_array_index(). 

g_array_index() returns an index into an array: we're sure to find
something at that index (whether that something is in bounds is
a-whole-nother question).

This fixes CIDs 1362829 and 1362890/1362830.  There were other CIDs like
this but they've already been fixed.

Change-Id: I94af0931b9adf3abd3bedc969e399cda98bbdd07
Reviewed-on: https://code.wireshark.org/review/16168
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
This commit is contained in:
Jeff Morriss 2016-06-27 09:48:35 -04:00 committed by Jaap Keuter
parent 2ab4155794
commit d90e6e74da
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui/qt/endpoint_dialog.cpp
View File

@ -272,10 +272,6 @@ public:
#endif
hostlist_talker_t *endp_item = &g_array_index(conv_array_, hostlist_talker_t, conv_idx_);
if (!endp_item) {
return QVariant();
}
switch (col) {
case ENDP_COLUMN_ADDR:
{
@ -360,10 +356,6 @@ public:
hostlist_talker_t *endp_item = &g_array_index(conv_array_, hostlist_talker_t, conv_idx_);
hostlist_talker_t *other_item = &g_array_index(other_row->conv_array_, hostlist_talker_t, other_row->conv_idx_);
if (!endp_item || !other_item) {
return false;
}
int sort_col = treeWidget()->sortColumn();
switch(sort_col) {