From: Kevin P. Fleming <kpfleming@digium.com>
Date: Thu, 2 Apr 2009 17:27:42 +0000 (+0000)
Subject: Merged revisions 186101 via svnmerge from
X-Git-Tag: 1.6.1.0-rc4~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=060e4ef57c4503908f359a3f0090348ce41fbccf;p=thirdparty%2Fasterisk.git

Merged revisions 186101 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r186101 | kpfleming | 2009-04-02 12:26:07 -0500 (Thu, 02 Apr 2009) | 9 lines

  Merged revisions 186081 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r186081 | kpfleming | 2009-04-02 12:21:29 -0500 (Thu, 02 Apr 2009) | 3 lines

    ensure that the buffer passed to DAHDI_SET_BUFINFO is fully initialized
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@186108 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 7cb9a2ea82..5a20700c42 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -11955,6 +11955,7 @@ static int start_pri(struct dahdi_pri *pri)
 			pri->dchanavail[i] |= DCHAN_NOTINALARM;
 		else
 			pri->dchanavail[i] &= ~DCHAN_NOTINALARM;
+		memset(&bi, 0, sizeof(bi));
 		bi.txbufpolicy = DAHDI_POLICY_IMMEDIATE;
 		bi.rxbufpolicy = DAHDI_POLICY_IMMEDIATE;
 		bi.numbufs = 32;
@@ -13542,6 +13543,7 @@ static int linkset_addsigchan(int sigchan)
 			return -1;
 		}
 
+		memset(&bi, 0, sizeof(bi));
 		bi.txbufpolicy = DAHDI_POLICY_IMMEDIATE;
 		bi.rxbufpolicy = DAHDI_POLICY_IMMEDIATE;
 		bi.numbufs = 32;