diff options
| author | Guy Harris <guy@alum.mit.edu> | 2009-03-18 21:40:04 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2009-03-18 21:40:04 +0000 |
| commit | cf536e062b5ac17b4f91a8fe706fd1dfb62622ea (patch) | |
| tree | 30de26c122ea8807090dc92712d041bb02bb9567 | |
| parent | bd7aaf750a8577cd94a7dc3f36b5adeca14a5252 (diff) | |
Don't g_assert() in a dissector, just drive on.
Use ws_fopen(), not fopen(), to open files.
svn path=/trunk/; revision=27789
| -rw-r--r-- | epan/dissectors/packet-vcdu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-vcdu.c b/epan/dissectors/packet-vcdu.c index bb6fba853f..7020944fc5 100644 --- a/epan/dissectors/packet-vcdu.c +++ b/epan/dissectors/packet-vcdu.c @@ -35,6 +35,7 @@ #include <glib.h> #include <epan/packet.h> #include <epan/filesystem.h> +#include <wsutil/file_util.h> /* Initialize the protocol and registered fields */ @@ -267,7 +268,7 @@ dissect_vcdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { bitstream_channels_file_read = 1; filename = get_persconffile_path ( ".bitstream_channels", FALSE, FALSE ); - fp = fopen ( filename, "r" ); + fp = ws_fopen ( filename, "r" ); if ( NULL != fp ) { @@ -440,7 +441,6 @@ dissect_vcdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* printf ( "new_ptr=%d new_offset=%d apid=%d ccsds_len=%d\n", new_ptr, new_offset, apid, ccsds_len ); fflush(stdout); */ new_tvb = tvb_new_subset(tvb, new_offset, -1, -1); - g_assert(ccsds_handle != NULL); call_dissector(ccsds_handle, new_tvb, pinfo, vcdu_tree); new_offset=new_offset+ccsds_len+7; |