From: Mark Michelson <mmichelson@digium.com>
Date: Mon, 6 Apr 2015 16:02:28 +0000 (+0000)
Subject: Ensure that a non-zero sample rate is returned for all formats.
X-Git-Tag: 14.0.0-beta1~1121
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=edf9da436554973fe830fedea3ff2d059e8883e5;p=thirdparty%2Fasterisk.git

Ensure that a non-zero sample rate is returned for all formats.

Versions of Asterisk prior to 12 defaulted to 8000 as a sample rate
if one was not provided by a format. In Asterisk 13, this was removed.
The result was that some calculations which involve dividing by the
sample rate resulted in dividing by 0. The fix being put in place
here is to have the same default fallback that was present in previous
versions of Asterisk.

Asterisk-24914 #close
Reported by Marcello Ceschia
........

Merged revisions 434046 from http://svn.asterisk.org/svn/asterisk/branches/13


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

diff --git a/main/format.c b/main/format.c
index b6661574e5..3e1ee866ec 100644
--- a/main/format.c
+++ b/main/format.c
@@ -375,7 +375,7 @@ unsigned int ast_format_get_minimum_bytes(const struct ast_format *format)
 
 unsigned int ast_format_get_sample_rate(const struct ast_format *format)
 {
-	return format->codec->sample_rate;
+	return format->codec->sample_rate ?: 8000;
 }
 
 unsigned int ast_format_determine_length(const struct ast_format *format, unsigned int samples)