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

Fix Coverity CID 1050093: Dereference before null check. 

svn path=/trunk/; revision=50668
This commit is contained in:
Chris Maynard 2013-07-16 15:37:06 +00:00
parent 02fa8a5d19
commit 70cac937e8
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
frame_tvbuff.c
View File

@ -145,8 +145,8 @@ frame_pbrk_guint8(tvbuff_t *tvb, guint abs_offset, guint limit, const guint8 *ne
static gsize
frame_sizeof(void)
{
return sizeof(struct tvb_frame);
{
return sizeof(struct tvb_frame);
}
static guint
@ -196,13 +196,19 @@ frame_tvbuff_new(const frame_data *fd, const guint8 *buf)
*
* For now, we clip the reported length at G_MAXINT
*
* (XXX, is this still a problem?) There was an exception when we call
* (XXX, is this still a problem?) There was an exception when we call
* tvb_new_real_data() now there's no one
*/
tvb->real_data = buf;
tvb->length = fd->cap_len;
tvb->reported_length = fd->pkt_len > G_MAXINT ? G_MAXINT : fd->pkt_len;
if (fd) {
tvb->length = fd->cap_len;
tvb->reported_length = fd->pkt_len > G_MAXINT ? G_MAXINT : fd->pkt_len;
} else {
tvb->length = 0;
tvb->reported_length = 0;
}
tvb->initialized = TRUE;
/*