From 2f4bd1aea13341a00f82ff011781dcceee79953d Mon Sep 17 00:00:00 2001 From: sasha Date: Sat, 9 Aug 2008 09:33:08 +0000 Subject: - [ZBX-418] fixed possible server crash while processing macros git-svn-id: svn://svn.zabbix.com/trunk@5888 97f52cf1-0a1b-0410-bd0e-c28be96e8082 --- ChangeLog | 1 + src/libs/zbxserver/expression.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/ChangeLog b/ChangeLog index d1b42101..15e99924 100644 --- a/ChangeLog +++ b/ChangeLog @@ -126,6 +126,7 @@ Changes for 1.5: Changes for 1.4.7: + - [ZBX-418] fixed possible server crash while processing macros (Sasha) - [ZBX-370] fixed cpu.c for system.cpu.load[] processing (Sasha) Changes for 1.4.6: diff --git a/src/libs/zbxserver/expression.c b/src/libs/zbxserver/expression.c index 3141d35d..ae528753 100644 --- a/src/libs/zbxserver/expression.c +++ b/src/libs/zbxserver/expression.c @@ -649,6 +649,8 @@ static char** extract_numbers(char *str, int *count) result[(*count)-1][len] = '\0'; s = e; + if (*s == '\0') + break; } return result; -- cgit