You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Automerge script b375abae50 Merged revisions 378374,378377,378384 via svnmerge from ... file:///srv/subversion/repos/asterisk/trunk ................ r378374 | rmudgett | 2013-01-02 15:23:16 -0600 (Wed, 02 Jan 2013) | 33 lines Fix AMI redirect action with two channels failing to redirect both channels. The AMI redirect action can fail to redirect two channels that are bridged together. There is a race between the AMI thread redirecting the two channels and the bridge thread noticing that a channel is hungup from the redirects. * Made the bridge wait for both channels to be redirected before exiting. * Made the AMI redirect check that all required headers are present before proceeding with the redirection. * Made the AMI redirect require that any supplied ExtraChannel exist before proceeding. Previously the code fell back to a single channel redirect operation. (closes issue ASTERISK-18975) Reported by: Ben Klang (closes issue ASTERISK-19948) Reported by: Brent Dalgleish Patches: jira_asterisk_19948_v11.patch (license #5621) patch uploaded by rmudgett Tested by: rmudgett, Thomas Sevestre, Deepak Lohani, Kayode Review: https://reviewboard.asterisk.org/r/2243/ ........ Merged revisions 378356 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 378358 from http://svn.asterisk.org/svn/asterisk/branches/11 ................ r378377 | mjordan | 2013-01-02 16:10:32 -0600 (Wed, 02 Jan 2013) | 24 lines Prevent crashes from occurring when reading from data sources with large values When reading configuration data from an Asterisk .conf file or when pulling data from an Asterisk RealTime backend, Asterisk was copying the data on the stack for manipulation. Unfortunately, it is possible to read configuration data or realtime data from some data source that provides a large blob of characters. This could potentially cause a crash via a stack overflow. This patch prevents large sets of data from being read from an ARA backend or from an Asterisk conf file. (issue ASTERISK-20658) Reported by: wdoekes Tested by: wdoekes, mmichelson patches: * issueA20658_dont_process_overlong_config_lines.patch uploaded by wdoekes (license 5674) * issueA20658_func_realtime_limit.patch uploaded by wdoekes (license 5674) ........ Merged revisions 378375 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 378376 from http://svn.asterisk.org/svn/asterisk/branches/11 ................ r378384 | mjordan | 2013-01-02 16:19:32 -0600 (Wed, 02 Jan 2013) | 11 lines Clean up app_mysql's application entry points to properly parse arguments When parsing arguments, application entry points should not attempt to directly modify the parameters to the function. This patch properly duplicates the passed in parameters before attempting to parse them. (issue ASTERISK-20658) Reported by: wdoekes patches: issueA20658_sanitize_app_mysql.patch uploaded by wdoekes (license 5674) ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@378385 65c4cc65-6c06-0410-ace0-fbb531ad65f3		13 years ago
..
Makefile	Title update	13 years ago
func_aes.c	Fix many issues from the NULL_RETURNS Coverity report	13 years ago
func_audiohookinherit.c	func_audiohookinherit: Document some missed sources.	13 years ago
func_base64.c	Merged revisions 328247 via svnmerge from	14 years ago
func_blacklist.c	Opaquify ast_channel structs and lists	13 years ago
func_callcompletion.c	Merged revisions 328247 via svnmerge from	14 years ago
func_callerid.c	Allow for redirecting reasons to be set to arbitrary strings.	13 years ago
func_cdr.c	Coverity Report: Fix issues for error type UNINIT in Core supported modules	13 years ago
func_channel.c	Named call pickup groups. Fixes, missing functionality, and improvements.	13 years ago
func_config.c	Merged revisions 328247 via svnmerge from	14 years ago
func_curl.c	Ensure that all ast_datastore_info structures are 'const'.	13 years ago
func_cut.c	Clean up and ensure proper usage of alloca()	13 years ago
func_db.c	Merged revisions 328247 via svnmerge from	14 years ago
func_devstate.c	Merged revisions 378322 via svnmerge from	13 years ago
func_dialgroup.c	Fix a variety of memory leaks	13 years ago
func_dialplan.c	Enable macros in 1.8 to find the next highest "h" extension in a context, like in 1.4.	13 years ago
func_enum.c	Allow ENUM query functions to report lookup errors	14 years ago
func_env.c	Fix places where a negative return from ftello could be used as invalid input	13 years ago
func_extstate.c	Merged revisions 328247 via svnmerge from	14 years ago
func_frame_trace.c	Commit framework for HANGUPCAUSE (replacement for SIP_CAUSE)	13 years ago
func_global.c	Clean up and ensure proper usage of alloca()	13 years ago
func_groupcount.c	Avoid cppcheck warnings; removing unused vars and a bit of cleanup.	13 years ago
func_hangupcause.c	Make the name of the "HangupCauseClear" application consistent	13 years ago
func_iconv.c	Merged revisions 328247 via svnmerge from	14 years ago
func_jitterbuffer.c	Refactor ast_timer_ack to return an error and handle the error in timer users	13 years ago
func_lock.c	Ensure that all ast_datastore_info structures are 'const'.	13 years ago
func_logic.c	Clean up and ensure proper usage of alloca()	13 years ago
func_math.c	Remove annoying unconditional debug message from INC/DEC functions.	13 years ago
func_md5.c	Merged revisions 328247 via svnmerge from	14 years ago
func_module.c	Merged revisions 328247 via svnmerge from	14 years ago
func_odbc.c	Fix misuses of asprintf throughout the code.	13 years ago
func_pitchshift.c	Merged revisions 328247 via svnmerge from	14 years ago
func_presencestate.c	"He who go through turnstile sideways is going to Bangkok"	13 years ago
func_rand.c	Merged revisions 328247 via svnmerge from	14 years ago
func_realtime.c	Merged revisions 378374,378377,378384 via svnmerge from	13 years ago
func_sha1.c	Merged revisions 328247 via svnmerge from	14 years ago
func_shell.c	Improve documentation for the SHELL() dialplan function.	13 years ago
func_speex.c	Doxygen Updates - janitor work	13 years ago
func_sprintf.c	Merged revisions 328247 via svnmerge from	14 years ago
func_srv.c	Merged revisions 328247 via svnmerge from	14 years ago
func_strings.c	Make evaluation of channel variables consistently case-sensitive.	13 years ago
func_sysinfo.c	Multiple revisions 361403,361412	13 years ago
func_timeout.c	Opaquify ast_channel structs and lists	13 years ago
func_uri.c	Merged revisions 328247 via svnmerge from	14 years ago
func_version.c	Fix documentation for ${VERSION(ASTERISK_VERSION_NUM)}.	13 years ago
func_vmcount.c	Merged revisions 328247 via svnmerge from	14 years ago
func_volume.c	Merged revisions 376918,376922 via svnmerge from	13 years ago