From 8fe74cdbb5a948b02b8dcb38f7e95a0bf5d1ede4 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Wed, 30 Mar 2016 14:23:05 +0200
Subject: [PATCH] maintain ChangeLog

---
 ChangeLog | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index b60781e04..82d610fe5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -31,6 +31,11 @@ Version 8.18.0 [v8-stable] 2016-04-19
   that might have some negative side effects. Also IP_FREEBIND is
   recommended by systemd documentation.
   Thanks to Nirmoy Das and Marius Tomaschewski for the patch.
+- bugfix: memory misallocation if position.from and position.to is used
+  a negative amount of memory is tried to be allocated if position.from
+  is smaller than the buffer size (at least with json variables). This
+  usually leads to a segfault.
+  closes https://github.com/rsyslog/rsyslog/issues/915
 - bugfix: $PrivDropToGroupID actually did a name lookup
   ... instead of using the provided ID
 - bugfix: small memory leak in imfile