Fix for bug #1117: Crash on next action [such as another stats window] when
flow graph window is open. Added if(pinfo->cinfo) before attempting to use pinfo->cinfo->col_first. The rest is indentation changes for the new if statement. svn path=/trunk/; revision=20028
This commit is contained in:
parent
5ab5899d5e
commit
212cbb2e8c
|
@ -256,25 +256,27 @@ static int flow_graph_frame_add_to_graph(packet_info *pinfo)
|
|||
}
|
||||
|
||||
|
||||
if (pinfo->cinfo->col_first[COL_INFO]>=0){
|
||||
if(pinfo->cinfo) {
|
||||
if (pinfo->cinfo->col_first[COL_INFO]>=0){
|
||||
|
||||
for (i = pinfo->cinfo->col_first[COL_INFO]; i <= pinfo->cinfo->col_last[COL_INFO]; i++) {
|
||||
if (pinfo->cinfo->fmt_matx[i][COL_INFO]) {
|
||||
colinfo = g_strdup(pinfo->cinfo->col_data[i]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
for (i = pinfo->cinfo->col_first[COL_INFO]; i <= pinfo->cinfo->col_last[COL_INFO]; i++) {
|
||||
if (pinfo->cinfo->fmt_matx[i][COL_INFO]) {
|
||||
colinfo = g_strdup(pinfo->cinfo->col_data[i]);
|
||||
if (pinfo->cinfo->col_first[COL_PROTOCOL]>=0){
|
||||
|
||||
for (i = pinfo->cinfo->col_first[COL_PROTOCOL]; i <= pinfo->cinfo->col_last[COL_PROTOCOL]; i++) {
|
||||
if (pinfo->cinfo->fmt_matx[i][COL_PROTOCOL]) {
|
||||
protocol = g_strdup(pinfo->cinfo->col_data[i]);
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (pinfo->cinfo->col_first[COL_PROTOCOL]>=0){
|
||||
|
||||
for (i = pinfo->cinfo->col_first[COL_PROTOCOL]; i <= pinfo->cinfo->col_last[COL_PROTOCOL]; i++) {
|
||||
if (pinfo->cinfo->fmt_matx[i][COL_PROTOCOL]) {
|
||||
protocol = g_strdup(pinfo->cinfo->col_data[i]);
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (colinfo != NULL) {
|
||||
if (protocol != NULL) {
|
||||
gai->frame_label = g_strdup_printf("%.19s", colinfo);
|
||||
|
|
Loading…
Reference in New Issue