diff options
| author | dimir <vladimir.levijev@zabbix.com> | 2022-11-05 17:43:20 +0300 |
|---|---|---|
| committer | dimir <vladimir.levijev@zabbix.com> | 2022-11-09 14:51:57 +0300 |
| commit | 06825c53e5dda22a832854a3b2d8ed47d49cb4fd (patch) | |
| tree | 73b6ab83847660162264d0c6f7ccc7c0202baa75 | |
| parent | fb831f3178b898a0db64d2e7f017aae825d18533 (diff) | |
.......... [ZBX-21715] fixed zabbix_js crash when parsing short version of "timeout" option -t
Merge from development branch feature/ZBX-21715-5.0
* commit '626c1865af4ec548e23f4546c3526f8f695b30c1':
.D........ [ZBX-21715] "improve" ChangeLog entry
.D........ [ZBX-21715] add ChangeLog entry
.......... [ZBX-21715] zabbix_js: fix crash when parsing short version of "timeout" option -t
(cherry picked from commit 987ff5b9cdc5aaf21de744c843e78da785e660f1)
(cherry picked from commit 07d9ae36732e63cb851c7b0cc4c97d287d3c1d4f)
(cherry picked from commit 5c40c1b46d215cd3968c4145ce6a26ac9387dde7)
| -rw-r--r-- | ChangeLog.d/bugfix/ZBX-21715 | 1 | ||||
| -rw-r--r-- | src/zabbix_js/zabbix_js.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/ChangeLog.d/bugfix/ZBX-21715 b/ChangeLog.d/bugfix/ZBX-21715 new file mode 100644 index 00000000000..57e0a1c6498 --- /dev/null +++ b/ChangeLog.d/bugfix/ZBX-21715 @@ -0,0 +1 @@ +.......... [ZBX-21715] fixed Zabbix JS (zabbix_js) crash when parsing short version of "timeout" option -t (dimir) diff --git a/src/zabbix_js/zabbix_js.c b/src/zabbix_js/zabbix_js.c index 06d1bbea1b9..61a78a46bd9 100644 --- a/src/zabbix_js/zabbix_js.c +++ b/src/zabbix_js/zabbix_js.c @@ -69,7 +69,7 @@ struct zbx_option longopts[] = }; /* short options */ -static char shortopts[] = "s:i:p:hVl:t"; +static char shortopts[] = "s:i:p:hVl:t:"; /* end of COMMAND LINE OPTIONS */ |