From 9664ce2a8083f693d19ff95e977d72eaf8caca2a Mon Sep 17 00:00:00 2001 From: Bruna Moreira Date: Thu, 12 Jan 2012 14:33:37 -0400 Subject: [PATCH] Fix EIR name parsing Some vendors put a NUL byte terminator on EIR name field. If that is the case, use -1 as string length so g_utf8_validade() can parse it properly. --- src/eir.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/eir.c b/src/eir.c index e4554e8b9..3826f55d4 100644 --- a/src/eir.c +++ b/src/eir.c @@ -119,6 +119,7 @@ int eir_parse(struct eir_data *eir, uint8_t *eir_data, uint8_t eir_len) while (len < eir_len - 1) { uint8_t field_len = eir_data[0]; + ssize_t name_len; /* Check for the end of EIR */ if (field_len == 0) @@ -154,8 +155,16 @@ int eir_parse(struct eir_data *eir, uint8_t *eir_data, uint8_t eir_len) case EIR_NAME_SHORT: case EIR_NAME_COMPLETE: + /* Some vendors put a NUL byte terminator. If that is + * the case, use -1 as string length so + * g_utf8_validade() can parse it properly. */ + if (eir_data[field_len] == '\0') + name_len = -1; + else + name_len = field_len - 1; + if (!g_utf8_validate((char *) &eir_data[2], - field_len - 1, NULL)) + name_len, NULL)) break; g_free(eir->name); -- 2.47.3