Skip to content
Snippets Groups Projects
  • Automerge script's avatar
    b375abae
    Merged revisions 378374,378377,378384 via svnmerge from · b375abae
    Automerge script authored
    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
    b375abae
    History
    Merged revisions 378374,378377,378384 via svnmerge from
    Automerge script authored
    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