diff options
| author | Nathan Williams <njw@chromium.org> | 2011-06-23 18:01:46 -0400 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2011-06-30 12:23:44 -0500 |
| commit | 5e7f10e09170379cfa40349c7ba7e46f37c0906f (patch) | |
| tree | 96f142ed41cfdb784625a3b986f0de2f293f64e4 | |
| parent | 2bd39050783baabd50ba0777b7d16c0024cce298 (diff) | |
| download | ModemManager-5e7f10e09170379cfa40349c7ba7e46f37c0906f.tar.gz | |
gsm: handle case of entirely empty SPN correctly
BUG=none
TEST=Insert a SIM with a present but empty (all 0xFF) SPN and check
the system log for a (lack of) assertion errors from mm_charset_gsm_unpacked_to_utf8().
Change-Id: I1250494b9757c9bfdce56402a4471c598f41223f
Reviewed-on: http://gerrit.chromium.org/gerrit/3139
Reviewed-by: Eric Shienbrood <ers@chromium.org>
Tested-by: Nathan J. Williams <njw@chromium.org>
| -rw-r--r-- | src/mm-generic-gsm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mm-generic-gsm.c b/src/mm-generic-gsm.c index 072ce19eb..105288505 100644 --- a/src/mm-generic-gsm.c +++ b/src/mm-generic-gsm.c @@ -1986,7 +1986,7 @@ get_spn_done (MMAtSerialPort *port, } /* Remove the FF filler at the end */ - while (bin[buflen - 1] == (char)0xff) + while (buflen > 1 && bin[buflen - 1] == (char)0xff) buflen--; /* First byte is metadata; remainder is GSM-7 unpacked into octets; convert to UTF8 */ |