Fix error paths in action_hangup() for AMI Hangup action.

* Check allocation function return values for failure.  Crashing is bad.

* Tweak ast_regex_string_to_regex_pattern() parameters for proper ast_str 
usage.  


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@368714 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2012-06-08 21:08:17 +00:00
parent 8b2412db28
commit 745484e1b3
3 changed files with 46 additions and 40 deletions

View File

@@ -253,19 +253,19 @@ int ast_build_string(char **buffer, size_t *space, const char *fmt, ...) __attri
int ast_build_string_va(char **buffer, size_t *space, const char *fmt, va_list ap) __attribute__((format(printf, 3, 0)));
/*!
\brief Given a string regex_string in the form of "/regex/", convert it into the form of "regex"
This function will trim one leading / and one trailing / from a given input string
ast_str regex_pattern must be preallocated before calling this function
\return 0 on success, non-zero on failure.
\return 1 if we only stripped a leading /
\return 2 if we only stripped a trailing /
\return 3 if we did not strip any / characters
\param regex_string the string containing /regex/
\param regex_pattern the destination ast_str which will contain "regex" after execution
*/
int ast_regex_string_to_regex_pattern(const char *regex_string, struct ast_str *regex_pattern);
* \brief Given a string regex_string in the form of "/regex/", convert it into the form of "regex"
*
* This function will trim one leading / and one trailing / from a given input string
* ast_str regex_pattern must be preallocated before calling this function
*
* \return 0 on success, non-zero on failure.
* \return 1 if we only stripped a leading /
* \return 2 if we only stripped a trailing /
* \return 3 if we did not strip any / characters
* \param regex_string the string containing /regex/
* \param regex_pattern the destination ast_str which will contain "regex" after execution
*/
int ast_regex_string_to_regex_pattern(const char *regex_string, struct ast_str **regex_pattern);
/*!
* \brief Make sure something is true.