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

AT: fix check for non-numeric CME errors 

Fix the digit check, testing a pointer as character is an error.

Change-Id: I1ce2898dd1cca0b61bb2da342c81bc648fdb1cf2
Fixes: v2.9.0rc0-1356-g51c6fde9c7 ("AT: Distinguish between numeric and textual CME errors")
Reviewed-on: https://code.wireshark.org/review/28962
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Peter Wu 2018-08-05 00:46:33 +02:00 committed by Anders Broman
parent 4d650e7249
commit 114012dc4b
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
epan/dissectors/packet-at.c
View File

@ -836,7 +836,6 @@ dissect_cme_error_parameter(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t
{
guint32 value;
gint i;
guint8 *next_char;
if (!(role == ROLE_DCE && type == TYPE_RESPONSE)) {
return FALSE;
@ -845,14 +844,12 @@ dissect_cme_error_parameter(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t
if (parameter_number > 0) return FALSE;
/* CME Error might work in 2 modes: Numeric error codes or Verbose error messages */
/* if the parameter stream contains any letters, assume verbose */
next_char = parameter_stream;
/* if the parameter stream contains non-digits, assume verbose */
for (i = 0; i < parameter_length; i++) {
if (g_ascii_isalpha(next_char)) {
if (!g_ascii_isdigit(parameter_stream[i])) {
proto_tree_add_item(tree, hf_cme_error_verbose, tvb, offset, parameter_length, ENC_NA | ENC_ASCII);
return TRUE;
}
next_char++;
}
/* Assume numeric error code*/
value = get_uint_parameter(parameter_stream, parameter_length);