From f201a2b11b3658e90ed292e38dd685d998709f28 Mon Sep 17 00:00:00 2001 From: "Kevin P. Fleming" Date: Tue, 11 Mar 2008 15:18:45 +0000 Subject: [PATCH] backport a fix from trunk git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@107472 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_rpt.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/apps/app_rpt.c b/apps/app_rpt.c index 292dfc6f69..952fdd0b16 100644 --- a/apps/app_rpt.c +++ b/apps/app_rpt.c @@ -1646,12 +1646,8 @@ static char *cs_keywords[] = {"rptena","rptdis","apena","apdis","lnkena","lnkdis memset(&rpt_vars[n].p,0,sizeof(rpt_vars[n].p)); if (init) { - char *cp; - int savearea = (char *)&rpt_vars[n].p - (char *)&rpt_vars[n]; - - cp = (char *) &rpt_vars[n].p; - memset(cp + sizeof(rpt_vars[n].p),0, - sizeof(rpt_vars[n]) - (sizeof(rpt_vars[n].p) + savearea)); + /* clear all the fields in the structure after 'p' */ + memset(&rpt_vars[n].p + sizeof(rpt_vars[0].p), 0, sizeof(rpt_vars[0]) - sizeof(rpt_vars[0].p) - offsetof(typeof(rpt_vars[0]), p)); rpt_vars[n].tele.next = &rpt_vars[n].tele; rpt_vars[n].tele.prev = &rpt_vars[n].tele; rpt_vars[n].rpt_thread = AST_PTHREADT_NULL;