osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

From Martin Mathieson: 

Fix coverity bugs.

svn path=/trunk/; revision=17909
This commit is contained in:
Anders Broman 2006-04-19 18:57:25 +00:00
parent a7852884e8
commit b99bf25795
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
wiretap/catapult_dct2000.c
View File

@ -840,6 +840,11 @@ gboolean parse_line(gint length, gint *seconds, gint *useconds,
}
protocol_name[protocol_chars] = linebuff[n];
}
if (protocol_chars == MAX_PROTOCOL_NAME)
{
/* If doesn't fit, fail rather than truncate */
return FALSE;
}
protocol_name[protocol_chars] = '\0';
/* Slash char must follow protocol name */
@ -984,10 +989,17 @@ gboolean parse_line(gint length, gint *seconds, gint *useconds,
{
if (!isdigit(linebuff[n]))
{
/* Found a non-digit before decimal point. Fail */
return FALSE;
}
seconds_buff[seconds_chars] = linebuff[n];
}
if (seconds_chars > MAX_SECONDS_CHARS)
{
/* Didn't fit in buffer. Fail rather than use truncated */
return FALSE;
}
/* Convert found value into number */
seconds_buff[seconds_chars] = '\0';
*seconds = atoi(seconds_buff);
@ -1013,6 +1025,11 @@ gboolean parse_line(gint length, gint *seconds, gint *useconds,
}
subsecond_decimals_buff[subsecond_decimals_chars] = linebuff[n];
}
if (subsecond_decimals_chars > MAX_SUBSECOND_DECIMALS)
{
/* More numbers than expected - give up */
return FALSE;
}
/* Convert found value into microseconds */
subsecond_decimals_buff[subsecond_decimals_chars] = '\0';
*useconds = atoi(subsecond_decimals_buff) * 100;