diff options
| author | Vladislavs Sokurenko <vladislavs.sokurenko@zabbix.com> | 2021-08-20 16:23:12 +0300 |
|---|---|---|
| committer | Vladislavs Sokurenko <vladislavs.sokurenko@zabbix.com> | 2021-08-20 16:24:51 +0300 |
| commit | b3bf69209c1919973c36cf48b80191a5a169d03f (patch) | |
| tree | 60e67faffdb131ac35866e82eb7888d9e051d6f2 /include/common.h | |
| parent | b92655d119ce9aa1788cecc34e891462f5c39301 (diff) | |
........S. [ZBX-19745] fixed Zabbix server exiting when quoted user macro context ends with backslash
........S. [ZBX-19745] fixed Zabbix server exiting when quoted user macro context ends with backslash
* commit '848bd723265b1411302016264ac63675cac08e31':
.D........ [ZBX-19745] fixed ChangeLog
........S. [ZBX-19745] fixed error message
........S. [ZBX-19745] moved error messsage formatting to the function that is generating this error
.D........ [ZBX-19745] added ChangeLog entry
........S. [ZBX-19745] fixed handling error handling
........S. [ZBX-19745] fixed handling of "impossible" errors
........S. [ZBX-19745] fixed Zabbix server exitting when invalid user macro context is specified
(cherry picked from commit 38baef70b53e7010ad45d4227c1401bcf8c52e1d)
Diffstat (limited to 'include/common.h')
| -rw-r--r-- | include/common.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/common.h b/include/common.h index 99123a9fa45..18438b87e29 100644 --- a/include/common.h +++ b/include/common.h @@ -1400,7 +1400,7 @@ int zbx_user_macro_parse(const char *macro, int *macro_r, int *context_l, int *c int zbx_user_macro_parse_dyn(const char *macro, char **name, char **context, int *length, unsigned char *context_op); char *zbx_user_macro_unquote_context_dyn(const char *context, int len); -char *zbx_user_macro_quote_context_dyn(const char *context, int force_quote); +char *zbx_user_macro_quote_context_dyn(const char *context, int force_quote, char **error); #define ZBX_SESSION_ACTIVE 0 #define ZBX_SESSION_PASSIVE 1 |