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

From Duncan Salerno: 

Ensure dct3trac packets never longer than 23 bytes.

svn path=/trunk/; revision=28838
This commit is contained in:
Jaap Keuter 2009-06-24 20:27:58 +00:00
parent e03ac6b82e
commit 479b1ee737
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
wiretap/dct3trace.c
View File

@ -2,7 +2,7 @@
* Routines for reading signalling traces generated by Gammu (www.gammu.org)
* from Nokia DCT3 phones in Netmonitor mode.
*
* gammu --nokiadebug nhm5_587.txt v20-25,v18-19
* gammu --nokiadebug nhm5_587.txt v18-19
*
* Duncan Salerno <duncan.salerno@googlemail.com>
*
@ -73,6 +73,7 @@ static const char dct3trace_magic_l2_start[] = "<l2 ";
static const char dct3trace_magic_l2_end[] = "</l2>";
static const char dct3trace_magic_end[] = "</dump>";
#define MAX_PACKET_LEN 23
static gboolean dct3trace_read(wtap *wth, int *err, gchar **err_info,
gint64 *data_offset);
@ -103,6 +104,10 @@ hex2bin(unsigned char *out, unsigned char *in)
int is_low = 0;
int c;
/* Clamp to maximum packet size */
if (end - in > MAX_PACKET_LEN*2) /* As we're reading nibbles */
end = in + MAX_PACKET_LEN*2;
while (in < end)
{
c = hc2b(in[0]);
@ -143,6 +148,8 @@ xml_get_int(int *val, const unsigned char *str, const unsigned char *pattern)
end = strchr(start, '"');
if (end == NULL)
return -3;
if (end - start > 31)
return -4;
memcpy(buf, start, end - start);
buf[end - start] = '\0';
@ -288,7 +295,7 @@ static gboolean dct3trace_get_packet(FILE *fh, union wtap_pseudo_header *pseudo_
}
else if( !have_data && memcmp(dct3trace_magic_l2_start, line, strlen(dct3trace_magic_l2_start)) == 0 )
{
/* For uplink packets we don't get the raw L1, so have to recreate it from the L2 */
/* For uplink packets we might not get the raw L1, so have to recreate it from the L2 */
/* Parse L2 header if didn't get data from L1 <l2 ...> */
int data_len = 0;
char *ptr = strstr(line, "data=\"");
@ -336,7 +343,7 @@ static gboolean dct3trace_read(wtap *wth, int *err, gchar **err_info,
{
guint64 offset = file_tell(wth->fh);
int buf_len;
char buf[23];
char buf[MAX_PACKET_LEN];
if( !dct3trace_get_packet(wth->fh, &wth->pseudo_header, buf, &buf_len, err, err_info) )
{
@ -365,7 +372,7 @@ static gboolean dct3trace_seek_read (wtap *wth, gint64 seek_off,
int *err, gchar **err_info)
{
int buf_len;
char buf[23];
char buf[MAX_PACKET_LEN];
if (file_seek(wth->random_fh, seek_off, SEEK_SET, err) == -1)
{