[asterisk-commits] mjordan: branch 1.8 r385633 - /branches/1.8/channels/chan_alsa.c

[SVN commits to the Asterisk project]

Author: mjordan
Date: Sat Apr 13 21:21:30 2013
New Revision: 385633

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=385633
Log:
Don't attempt to create a voice frame on a read error

Prior to this patch, a read error in snd_pcm_readi would still be treated as a
nominal result when constructing a voice frame from the expected data. Since
the value returned is negative, as opposed to the number of samples read,
this could result in a crash. With this patch, we now return a null frame
when a read error is detected.

Note that the patch on ASTERISK-21329 was modified slightly for this commit,
in that we bail immediately on detecting the read error, rather than bypassing
the construction of the voice frame.

(closes issue ASTERISK-21329)
Reported by: Keiichiro Kawasaki
patches:
  chan_alsa.diff uploaded by kawasaki (License 6489)

Modified:
    branches/1.8/channels/chan_alsa.c

Modified: branches/1.8/channels/chan_alsa.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/channels/chan_alsa.c?view=diff&rev=385633&r1=385632&r2=385633
==============================================================================
--- branches/1.8/channels/chan_alsa.c (original)
+++ branches/1.8/channels/chan_alsa.c Sat Apr 13 21:21:30 2013
@@ -482,6 +482,13 @@
 	} else if (r >= 0) {
 		off -= r;
 	}
+
+	/* Return NULL frame on error */
+	if (r < 0) {
+		ast_mutex_unlock(&alsalock);
+		return &f;
+	}
+
 	/* Update positions */
 	readpos += r;
 	left -= r;