diff options
| author | sasha <sasha@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-08-09 09:33:08 +0000 |
|---|---|---|
| committer | sasha <sasha@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-08-09 09:33:08 +0000 |
| commit | 2f4bd1aea13341a00f82ff011781dcceee79953d (patch) | |
| tree | 60365e2c7864be3f8ba98b49338d1c19afa391df | |
| parent | d9ff665135bd0ac36a8fe284b5be08284aa68152 (diff) | |
| download | zabbix-2f4bd1aea13341a00f82ff011781dcceee79953d.tar.gz zabbix-2f4bd1aea13341a00f82ff011781dcceee79953d.tar.xz zabbix-2f4bd1aea13341a00f82ff011781dcceee79953d.zip | |
- [ZBX-418] fixed possible server crash while processing macros
git-svn-id: svn://svn.zabbix.com/trunk@5888 97f52cf1-0a1b-0410-bd0e-c28be96e8082
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | src/libs/zbxserver/expression.c | 2 |
2 files changed, 3 insertions, 0 deletions
@@ -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; |