--- src/smsutil.c | 37 ++++++++++++++++++++++++++++++------- 1 file changed, 30 insertions(+), 7 deletions(-) diff --git a/src/smsutil.c b/src/smsutil.c index a541964..59eb7b1 100644 --- a/src/smsutil.c +++ b/src/smsutil.c @@ -4090,7 +4090,7 @@ char *cbs_decode_text(GSList *cbs_list, char *iso639_lang) unsigned char unpacked[CBS_MAX_GSM_CHARS]; long written; int max_chars; - int i; + int i, j; max_chars = sms_text_capacity_gsm(CBS_MAX_GSM_CHARS, taken); @@ -4102,12 +4102,24 @@ char *cbs_decode_text(GSList *cbs_list, char *iso639_lang) i = iso639 ? 3 : 0; /* - * CR is a padding character, which means we can - * safely discard everything afterwards + * CR can be used as a padding character, which means + * we can safely discard everything afterwards */ + for (; i < written; i++, bufsize++) { - if (unpacked[i] == '\r') - break; + if (unpacked[i] == '\r') { + /* + * check if this is a padding character or + * if it is a wanted <CR> + */ + for (j=i+1; j < written; j++) + if (unpacked[j] != '\r') + break; + + if (j == written) + break; + } + buf[bufsize] = unpacked[i]; } @@ -4135,8 +4147,19 @@ char *cbs_decode_text(GSList *cbs_list, char *iso639_lang) } while (i < max_offset) { - if (ud[i] == 0x00 && ud[i+1] == '\r') - break; + if (ud[i] == 0x00 && ud[i+1] == '\r') { + int j = i+2; + + while (j < max_offset) { + if (ud[j] != 0x00 || ud[j+1] != '\r') + break; + + j += 2; + } + + if (j == max_offset) + break; + } buf[bufsize] = ud[i]; buf[bufsize + 1] = ud[i+1]; -- 1.7.9.5