summaryrefslogtreecommitdiffstats
path: root/collectors
diff options
context:
space:
mode:
authorCosta Tsaousis <costa@netdata.cloud>2022-11-02 20:23:35 +0200
committerGitHub <noreply@github.com>2022-11-02 20:23:35 +0200
commit04ecb72856e0559459bb468c40ad87d5779d9ec9 (patch)
tree73b5ccef83f173b6e7de0251dc14211a3cd5749e /collectors
parent2690887b4ecc7d43c9d992fb3910e3fa9361ece8 (diff)
fix chart definition end time_t printing and parsing (#13942)
* fix chart definition end time_t printing and parsing * properly check parameters to chart definition end
Diffstat (limited to 'collectors')
-rw-r--r--collectors/plugins.d/pluginsd_parser.c18
1 files changed, 16 insertions, 2 deletions
diff --git a/collectors/plugins.d/pluginsd_parser.c b/collectors/plugins.d/pluginsd_parser.c
index 2d20e8971c..852ae9dde1 100644
--- a/collectors/plugins.d/pluginsd_parser.c
+++ b/collectors/plugins.d/pluginsd_parser.c
@@ -261,8 +261,16 @@ PARSER_RC pluginsd_chart(char **words, size_t num_words, void *user)
PARSER_RC pluginsd_chart_definition_end(char **words, size_t num_words, void *user)
{
- long first_entry_child = str2l(get_word(words, num_words, 1));
- long last_entry_child = str2l(get_word(words, num_words, 2));
+ const char *first_entry_txt = get_word(words, num_words, 1);
+ const char *last_entry_txt = get_word(words, num_words, 2);
+
+ if(unlikely(!first_entry_txt || !last_entry_txt)) {
+ error("REPLAY: received " PLUGINSD_KEYWORD_CHART_DEFINITION_END " command without first or last entry. Disabling it.");
+ return PARSER_RC_ERROR;
+ }
+
+ long first_entry_child = str2l(first_entry_txt);
+ long last_entry_child = str2l(last_entry_txt);
PARSER_USER_OBJECT *user_object = (PARSER_USER_OBJECT *) user;
@@ -273,6 +281,12 @@ PARSER_RC pluginsd_chart_definition_end(char **words, size_t num_words, void *us
return PARSER_RC_ERROR;
}
+ internal_error(
+ (first_entry_child != 0 || last_entry_child != 0)
+ && (first_entry_child == 0 || last_entry_child == 0),
+ "REPLAY: received " PLUGINSD_KEYWORD_CHART_DEFINITION_END " with malformed timings (first time %llu, last time %llu).",
+ (unsigned long long)first_entry_child, (unsigned long long)last_entry_child);
+
rrdset_flag_clear(st, RRDSET_FLAG_RECEIVER_REPLICATION_FINISHED);
bool ok = replicate_chart_request(send_to_plugin, user_object->parser, host, st, first_entry_child, last_entry_child, 0, 0);