From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Wed, 4 Jan 2017 11:54:34 +0000 (+0000)
Subject: [Fix] Fix rra_ptr conversion
X-Git-Tag: 1.5.0~429
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=bd31dae3ac746694580f66c6b55fc99073925da0;p=rspamd.git

[Fix] Fix rra_ptr conversion
---

diff --git a/src/libutil/rrd.c b/src/libutil/rrd.c
index eda0a351e..026d0673f 100644
--- a/src/libutil/rrd.c
+++ b/src/libutil/rrd.c
@@ -1344,7 +1344,6 @@ rspamd_rrd_convert_ds (struct rspamd_rrd_file *old,
 	pdp_prep_old = &old->pdp_prep[idx_old];
 	pdp_prep_new = &cur->pdp_prep[idx_new];
 	memcpy (pdp_prep_new, pdp_prep_old, sizeof (*pdp_prep_new));
-	memcpy (&cur->rra_ptr[idx_new], &old->rra_ptr[idx_old], sizeof (*old->rra_ptr));
 	val_old = old->rrd_value;
 	val_new = cur->rrd_value;
 	old_ds = old->stat_head->ds_cnt;
@@ -1380,6 +1379,8 @@ rspamd_rrd_convert (const gchar *path, struct rspamd_rrd_file *old,
 	if (rrd) {
 		/* Copy old data */
 		memcpy (rrd->live_head, old->live_head, sizeof (*rrd->live_head));
+		memcpy (rrd->rra_ptr, old->rra_ptr,
+				sizeof (*old->rra_ptr) * rrd->stat_head->rra_cnt);
 
 		/*
 		 * Old DSes: