Matthew Jordan 66754b3f3d Fix crash in ConfBridge when user announcement is played for more than 2 users ...

A patch introduced in r354938 made it so that ConfBridge would not attempt to
play sound files if those files did not exist.  Unfortunately, ConfBridge uses
the same underlying function, play_sound_helper, to playback both sound files
and numbers to callers.  When a number is being played back, the name of the
sound file is expected to be NULL.  This NULL value was passed into a function
that tested for the existance of a sound file and is not tolerant to NULL
file names, causing a crash.

This patch fixes the behavior, such that if a sound file does not exist we
do not attempt to play it, but we only attempt that check if the a sound file
was specified in the first place.  If a sound file was not specified, we use
the 'play number' logic in the helper function.

(closes issue ASTERISK-19899)
Reported by: Florian Gilcher
Tested by: Florian Gilcher
patches:
  asterisk-19899.diff uploaded by mjordan (license 6283)
........

Merged revisions 367562 from http://svn.asterisk.org/svn/asterisk/branches/10


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

2012-05-24 13:33:53 +00:00

..

confbridge

Fix configuring custom sound_leader_has_left in confbridge.conf

2012-04-29 02:23:22 +00:00

app_adsiprog.c

Replace direct access to channel name with accessor functions

2012-01-09 22:15:50 +00:00

app_alarmreceiver.c

Convert some strncpys to ast_copy_string

2012-04-19 19:05:17 +00:00

app_amd.c

Opaquify ast_channel structs and lists

2012-02-29 16:52:47 +00:00

app_authenticate.c

ast_channel opaquification of pointers and integral types

2012-02-20 23:43:27 +00:00

app_cdr.c

ast_channel opaquification of pointers and integral types

2012-02-20 23:43:27 +00:00

app_celgenuserevent.c

Merged revisions 282979 via svnmerge from

2010-08-20 11:54:22 +00:00

app_chanisavail.c

app_chanisavail: Fix use of uninitialized variable.

2012-03-14 23:29:32 +00:00

app_channelredirect.c

Finalize ast_channel opaquification

2012-03-13 18:20:34 +00:00

app_chanspy.c

Coverity Report: Fix issues for error type UNINIT in Core supported modules

2012-05-10 15:57:26 +00:00

app_confbridge.c

Fix crash in ConfBridge when user announcement is played for more than 2 users

2012-05-24 13:33:53 +00:00

app_controlplayback.c

Merged revisions 328247 via svnmerge from

2011-07-14 20:28:54 +00:00

app_dahdibarge.c

Opaquify ast_channel typedefs, fd arrays, and softhangup flag

2012-03-01 22:09:18 +00:00

app_dahdiras.c

Opaquify ast_channel typedefs, fd arrays, and softhangup flag

2012-03-01 22:09:18 +00:00

app_db.c

Merged revisions 328247 via svnmerge from

2011-07-14 20:28:54 +00:00

app_dial.c

Commit framework for HANGUPCAUSE (replacement for SIP_CAUSE)

2012-05-14 19:44:27 +00:00

app_dictate.c

Opaquification for ast_format structs in struct ast_channel

2012-02-24 00:32:20 +00:00

app_directed_pickup.c

Update Pickup application documentation. (With feeling this time.)

2012-04-26 21:11:25 +00:00

app_directory.c

Resolve a few more cases of variable shadowing.

2012-03-08 17:48:14 +00:00

app_disa.c

Coverity Report: Fix issues for error type UNINIT in Core supported modules

2012-05-10 15:57:26 +00:00

app_dumpchan.c

Finalize ast_channel opaquification

2012-03-13 18:20:34 +00:00

app_echo.c

Prevent Echo() from relaying control, null, and modem frames

2012-03-20 20:42:34 +00:00

app_exec.c

Merged revisions 328247 via svnmerge from

2011-07-14 20:28:54 +00:00

app_externalivr.c

Add interrupt ('I') command to ExternalIVR.

2012-05-08 21:46:21 +00:00

app_fax.c

Opaquify ast_channel structs and lists

2012-02-29 16:52:47 +00:00

app_festival.c

Opaquification for ast_format structs in struct ast_channel

2012-02-24 00:32:20 +00:00

app_flash.c

Opaquify ast_channel typedefs, fd arrays, and softhangup flag

2012-03-01 22:09:18 +00:00

app_followme.c

Add predial support to FollowMe.

2012-05-15 16:53:09 +00:00

app_forkcdr.c

Make ForkCDR e option not set end time of the newly forked CDR log

2012-04-13 16:12:17 +00:00

app_getcpeid.c

Replace direct access to channel name with accessor functions

2012-01-09 22:15:50 +00:00

app_ices.c

Add missing newlines to CLI logging

2012-04-06 18:19:03 +00:00

app_image.c

Merged revisions 328247 via svnmerge from

2011-07-14 20:28:54 +00:00

app_ivrdemo.c

ast_channel opaquification of pointers and integral types

2012-02-20 23:43:27 +00:00

app_jack.c

app_jack: fix datastore memory leak in error handling path.

2012-03-24 03:03:20 +00:00

app_macro.c

Finalize ast_channel opaquification

2012-03-13 18:20:34 +00:00

app_meetme.c

Send relative path named recordings to the meetme directory instead of sounds

2012-04-13 15:38:08 +00:00

app_milliwatt.c

Replace GNU old-style field designator extensions to fix clang warnings

2012-04-04 18:08:28 +00:00

app_minivm.c

Fix a variety of memory leaks

2012-05-18 14:43:44 +00:00

app_mixmonitor.c

Introducing the log message unique call identifiers feature

2012-03-29 20:01:20 +00:00

app_morsecode.c

Merged revisions 336717 via svnmerge from

2011-09-19 20:23:29 +00:00

app_mp3.c

Opaquification for ast_format structs in struct ast_channel

2012-02-24 00:32:20 +00:00

app_nbscat.c

Opaquification for ast_format structs in struct ast_channel

2012-02-24 00:32:20 +00:00

app_originate.c

Added support for all slin formats to app_originate

2011-12-14 22:36:30 +00:00

app_osplookup.c

Avoid cppcheck warnings; removing unused vars and a bit of cleanup.

2012-04-17 18:57:40 +00:00

app_page.c

Fix a variety of memory leaks

2012-05-18 14:43:44 +00:00

app_parkandannounce.c

Finalize ast_channel opaquification

2012-03-13 18:20:34 +00:00

app_playback.c

ast_channel opaquification of pointers and integral types

2012-02-20 23:43:27 +00:00

app_playtones.c

ast_channel opaquification of pointers and integral types

2012-02-20 23:43:27 +00:00

app_privacy.c

Opaquify ast_channel structs and lists

2012-02-29 16:52:47 +00:00

app_queue.c

app_queue: Per Member ringinuse option and deprecation of ignorebusy

2012-05-18 19:39:54 +00:00

app_read.c

ast_channel opaquification of pointers and integral types

2012-02-20 23:43:27 +00:00

app_readexten.c

Opaquify ast_channel structs and lists

2012-02-29 16:52:47 +00:00

app_readfile.c

Merged revisions 328247 via svnmerge from

2011-07-14 20:28:54 +00:00

app_record.c

Fix a variety of memory leaks

2012-05-18 14:43:44 +00:00

app_saycounted.c

Merged revisions 336717 via svnmerge from

2011-09-19 20:23:29 +00:00

app_sayunixtime.c

ast_channel opaquification of pointers and integral types

2012-02-20 23:43:27 +00:00

app_senddtmf.c

Merged revisions 328247 via svnmerge from

2011-07-14 20:28:54 +00:00

app_sendtext.c

ast_channel opaquification of pointers and integral types

2012-02-20 23:43:27 +00:00

app_setcallerid.c

Opaquify ast_channel structs and lists

2012-02-29 16:52:47 +00:00

app_skel.c

Merged revisions 328247 via svnmerge from

2011-07-14 20:28:54 +00:00

app_sms.c

Fix a variety of potential buffer overflows

2012-04-19 02:40:55 +00:00

app_softhangup.c

ast_channel opaquification of pointers and integral types

2012-02-20 23:43:27 +00:00

app_speech_utils.c

Document Speech* apps hangup on failure and suggest TryExec

2012-04-20 14:50:42 +00:00

app_stack.c

Fix many issues from the NULL_RETURNS Coverity report

2012-05-04 22:17:38 +00:00

app_system.c

If the argument to the system application is quoted, ensure we remove the quotes before trying to execute.

2010-03-11 20:25:02 +00:00

app_talkdetect.c

Finalize ast_channel opaquification

2012-03-13 18:20:34 +00:00

app_test.c

Opaquification for ast_format structs in struct ast_channel

2012-02-24 00:32:20 +00:00

app_transfer.c

Fix the display of documentation for Transfer

2012-04-03 20:14:01 +00:00

app_url.c

Merged revisions 339777 via svnmerge from

2011-10-07 19:37:33 +00:00

app_userevent.c

Opaquify channel stringfields

2012-01-24 20:12:09 +00:00

app_verbose.c

ast_channel opaquification of pointers and integral types

2012-02-20 23:43:27 +00:00

app_voicemail.c

Fix a variety of memory leaks

2012-05-18 14:43:44 +00:00

app_voicemail.exports.in

Allow symbol export filtering to work properly on platforms that have symbol prefixes.

2010-04-02 18:57:58 +00:00

app_waitforring.c

Merged revisions 328247 via svnmerge from

2011-07-14 20:28:54 +00:00

app_waitforsilence.c

Opaquification for ast_format structs in struct ast_channel

2012-02-24 00:32:20 +00:00

app_waituntil.c

Merged revisions 328247 via svnmerge from

2011-07-14 20:28:54 +00:00

app_while.c

Opaquify ast_channel structs and lists

2012-02-29 16:52:47 +00:00

app_zapateller.c

Opaquify ast_channel structs and lists

2012-02-29 16:52:47 +00:00

enter.h

…

leave.h

…

Makefile

New HD ConfBridge conferencing application.

2011-04-21 18:11:40 +00:00