say: Fix a bug where SayNumber in Polish tries to play incorrect sound.

This change fixes a bug where calling SayNumber with a number divisible by
100 using the Polish language would cause the code to attempt to play a
sound file with an empty name.

(closes issue ASTERISK-23509)
Reported by: zvision

Review: https://reviewboard.asterisk.org/r/3378/
........

Merged revisions 411243 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 411244 from http://svn.asterisk.org/svn/asterisk/branches/11
........

Merged revisions 411245 from http://svn.asterisk.org/svn/asterisk/branches/12

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

diff --git a/main/say.c b/main/say.c
index f8dcd4ea6b0acfc638e3d6783187391d43501ff9..bda1da3c3c231adcf6864f0179c0c360c8aa35e5 100644 (file)
--- a/main/say.c
+++ b/main/say.c
@@ -1932,17 +1932,17 @@ static void powiedz(struct ast_channel *chan, const char *language, int audiofd,
        if (i100>0)
                pl_odtworz_plik(chan, language, audiofd, ctrlfd, ints, odm->setki[i100]);
 
-       if ( m100 > 0 && m100 <=9 ) {
-               if (m1000>0)
+       if (m100 > 0 && m100 <= 9) {
+               if (m1000 > 0)
                        pl_odtworz_plik(chan, language, audiofd, ctrlfd, ints, odm->cyfry2[m100]);
                else
                        pl_odtworz_plik(chan, language, audiofd, ctrlfd, ints, odm->cyfry[m100]);
-       } else if (m100 % 10 == 0) {
+       } else if (m100 % 10 == 0 && m100 != 0) {
                pl_odtworz_plik(chan, language, audiofd, ctrlfd, ints, odm->dziesiatki[m100 / 10]);
-       } else if (m100 <= 19 ) {
+       } else if (m100 > 10 && m100 <= 19) {
                pl_odtworz_plik(chan, language, audiofd, ctrlfd, ints, odm->nastki[m100 % 10]);
-       } else if (m100 != 0) {
-               if (odm->separator_dziesiatek[0]==' ') {
+       } else if (m100 > 20) {
+               if (odm->separator_dziesiatek[0] == ' ') {
                        pl_odtworz_plik(chan, language, audiofd, ctrlfd, ints, odm->dziesiatki[m100 / 10]);
                        pl_odtworz_plik(chan, language, audiofd, ctrlfd, ints, odm->cyfry2[m100 % 10]);
                } else {