[zaptel-commits] russell: trunk r1508 - in /trunk: ./ wct4xxp/base.c

[zaptel-commits at lists.digium.com]

Author: russell
Date: Tue Oct 17 11:45:27 2006
New Revision: 1508

URL: http://svn.digium.com/view/zaptel?rev=1508&view=rev
Log:
Merged revisions 1507 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.4

........
r1507 | russell | 2006-10-17 12:40:45 -0400 (Tue, 17 Oct 2006) | 4 lines

Set the readbuf size to be the same size of the variable, readsize.  This buffer
was 31 bytes, while the readsize could be 32 bytes, causing a read into invalid
memory.  (issue #8155, araasch)

........

Modified:
    trunk/   (props changed)
    trunk/wct4xxp/base.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Tue Oct 17 11:45:27 2006
@@ -1,1 +1,1 @@
-/branches/1.4:1-1471,1490,1500
+/branches/1.4:1-1471,1490,1500,1507

Modified: trunk/wct4xxp/base.c
URL: http://svn.digium.com/view/zaptel/trunk/wct4xxp/base.c?rev=1508&r1=1507&r2=1508&view=diff
==============================================================================
--- trunk/wct4xxp/base.c (original)
+++ trunk/wct4xxp/base.c Tue Oct 17 11:45:27 2006
@@ -2637,7 +2637,7 @@
 	if (readsize > 0) {
 		struct zt_chan *sigchan = ts->sigchan;
 		int i;
-		unsigned char readbuf[FRMR_RBCL_MAX_SIZE];
+		unsigned char readbuf[readsize];
 
 		if (debug & DEBUG_FRAMER) printk("Framer %d: Got RPF/RME! readsize is %d\n", sigchan->span->offset, readsize);