From: Stefan Knoblich Date: Thu, 30 Jun 2011 21:49:45 +0000 (+0200) Subject: ftmod_libpri: final fix called number overlap receiving... X-Git-Tag: v1.2-rc1~108^2^2~102 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1c608f0a5deab1142e459e709a33baf51823f7f4;p=thirdparty%2Ffreeswitch.git ftmod_libpri: final fix called number overlap receiving... ftdm_copy_string() length parameter needs to include the terminating NUL byte. Signed-off-by: Stefan Knoblich Tested-by: Stefan Knoblich --- diff --git a/libs/freetdm/src/ftmod/ftmod_libpri/ftmod_libpri.c b/libs/freetdm/src/ftmod/ftmod_libpri/ftmod_libpri.c index 8bebbbe242..949989be21 100644 --- a/libs/freetdm/src/ftmod/ftmod_libpri/ftmod_libpri.c +++ b/libs/freetdm/src/ftmod/ftmod_libpri/ftmod_libpri.c @@ -890,14 +890,14 @@ static int on_info(lpwrap_pri_t *spri, lpwrap_pri_event_t event_type, pri_event if (!ftdm_strlen_zero(pevent->ring.callednum)) { int digits = strlen(pevent->ring.callednum); int offset = strlen(caller_data->dnis.digits); - int len = MIN(sizeof(caller_data->dnis.digits) - 1 - offset, digits); + int len = MIN(sizeof(caller_data->dnis.digits) - 1 - offset, digits); /* max. length without terminator */ if (len < digits) { ftdm_log_chan(chan, FTDM_LOG_WARNING, "Length %d of digit string exceeds available space %d of DNIS, truncating!\n", digits, len); } - ftdm_copy_string(&caller_data->dnis.digits[offset], (char *)pevent->ring.callednum, len); + ftdm_copy_string(&caller_data->dnis.digits[offset], (char *)pevent->ring.callednum, len + 1); /* max. length with terminator */ caller_data->dnis.digits[offset + len] = '\0'; } if (pevent->ring.complete) {