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

synphasor: prevent possible crash; gmtime() can return NULL; 

Don't do manual conversion of a time-field to UTC using gmtime().
Use the standard Wireshark mechanisms.

Change-Id: I2eaee074a590ecab492336bb6ad794bdd036f699
Reviewed-on: https://code.wireshark.org/review/6661
Reviewed-by: Bill Meier <wmeier@newsguy.com>
This commit is contained in:
Bill Meier 2015-01-19 15:19:46 -05:00
parent 7e1d73d0d4
commit 7a81add848
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
epan/dissectors/packet-synphasor.c
View File

@ -604,16 +604,8 @@ static gint dissect_header(tvbuff_t *tvb, proto_tree *tree)
offset += 2;
/* SOC */
{
/* can't use 'proto_tree_add_time()' because we need UTC */
char buf[20];
struct tm* t;
time_t soc = tvb_get_ntohl(tvb, offset);
t = gmtime(&soc);
strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", t);
proto_tree_add_string(tree, hf_soc, tvb, offset, 4, buf);
offset += 4;
}
proto_tree_add_item(tree, hf_soc, tvb, offset, 4, ENC_TIME_TIMESPEC | ENC_BIG_ENDIAN);
offset += 4;
/* FRACSEC */
/* time quality flags */
@ -1169,7 +1161,7 @@ void proto_register_synphasor(void)
NULL, 0x0, NULL, HFILL }},
{ &hf_soc,
{ "SOC time stamp (UTC)", "synphasor.soc", FT_STRINGZ, BASE_NONE,
{ "SOC time stamp", "synphasor.soc", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_UTC,
NULL, 0x0, NULL, HFILL }},
/* Time quality flags in fracsec */