[zaptel-commits] mattf: trunk r2407 - in /trunk: ./ zaptel.c

[zaptel-commits at lists.digium.com]

Author: mattf
Date: Wed Apr 11 14:05:38 2007
New Revision: 2407

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

................
r2406 | mattf | 2007-04-11 14:03:50 -0500 (Wed, 11 Apr 2007) | 12 lines

Merged revisions 2405 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r2405 | mattf | 2007-04-11 14:01:21 -0500 (Wed, 11 Apr 2007) | 4 lines

Fix buglet in memory corruption fix.



........

................

Modified:
    trunk/   (props changed)
    trunk/zaptel.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/zaptel.c
URL: http://svn.digium.com/view/zaptel/trunk/zaptel.c?view=diff&rev=2407&r1=2406&r2=2407
==============================================================================
--- trunk/zaptel.c (original)
+++ trunk/zaptel.c Wed Apr 11 14:05:38 2007
@@ -1811,7 +1811,7 @@
 	chan->readidx[res] = 0;
 	chan->readn[res] = 0;
 	oldbuf = res;
-	res = (chan->outreadbuf + 1) % chan->numbufs;
+	chan->outreadbuf = (res + 1) % chan->numbufs;
 	if (chan->outreadbuf == chan->inreadbuf) {
 		/* Out of stuff */
 		chan->outreadbuf = -1;