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

iso8583: use unsigned and fix bug in conversion routine. 

Change-Id: I0ba30bda3abec004f51f9402d65c38b3b1081113
Reviewed-on: https://code.wireshark.org/review/18144
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Paulo Roberto Brandão <betobrandao@gmail.com>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
This commit is contained in:
Dario Lombardo 2016-10-11 09:29:26 +02:00
parent 2534b8ece1
commit fcbb77191b
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
epan/dissectors/packet-iso8583.c
View File

@ -383,7 +383,7 @@ static struct iso_type *data_array = NULL;
static gint charset_pref = ASCII_CHARSET;
static gint bin_encode_pref = BIN_ASCII_ENC;
static gint iso8583_len=-1; /* # of bytes captured by the dissector */
static guint32 iso8583_len = 0; /* # of bytes captured by the dissector */
static gint len_byte_order = LITEND;
/*
@ -602,12 +602,12 @@ static guint64 hex2bin(const char* hexstr, int len)
if((offset -2 + len) > iso8583_len)\
return NULL
static gchar *get_bit(guint ind, tvbuff_t *tvb, gint *off_set, proto_tree *tree, proto_item **exp, gint *length )
static gchar *get_bit(guint ind, tvbuff_t *tvb, guint *off_set, proto_tree *tree, proto_item **exp, gint *length )
{
gchar aux[1024];
gchar* ret=NULL;
gint len;
gint offset = *off_set;
guint32 len;
guint offset = *off_set;
gboolean str_input = FALSE;
/* Check if it is a fixed or variable length
@ -624,13 +624,13 @@ static gchar *get_bit(guint ind, tvbuff_t *tvb, gint *off_set, proto_tree *tree,
{
case ASCII_CHARSET:
{
guint8* sizestr;
checksize(len);
if (!ws_strtoi32(tvb_get_string_enc(wmem_packet_scope(), tvb, offset,
len , ENC_ASCII), NULL, &len))
sizestr = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, len , ENC_ASCII);
offset += len;
if (!ws_strtou32(sizestr, NULL, &len))
return NULL;
offset+=len;
break;
}
case NUM_NIBBLE_CHARSET:
@ -736,7 +736,7 @@ static gchar *get_bit(guint ind, tvbuff_t *tvb, gint *off_set, proto_tree *tree,
}
static int get_bitmap(tvbuff_t *tvb, guint64* bitmap, gint offset, gint* nbitmaps)
static int get_bitmap(tvbuff_t *tvb, guint64* bitmap, guint offset, gint* nbitmaps)
{
gchar* hexbit;
gint i;