From 2c5225af430e2f3df60954abb1aef59c868f389a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@gmail.com>
Date: Fri, 5 Jan 2018 17:06:02 +0100
Subject: [PATCH] Fixed use-after-free found by asan

---
 lib/templatesimplifier.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/templatesimplifier.cpp b/lib/templatesimplifier.cpp
index 0e1fa2468..80cc3c220 100644
--- a/lib/templatesimplifier.cpp
+++ b/lib/templatesimplifier.cpp
@@ -811,6 +811,8 @@ void TemplateSimplifier::simplifyTemplateAliases(std::list<TemplateSimplifier::T
                 const Token * const fromEnd   = args[argnr].second->previous();
                 Token * const destToken = tok2;
                 tok2 = Tokenizer::copyTokens(tok2, fromStart, fromEnd, true);
+                if (tok2 == destToken->next())
+                    tok2 = destToken;
                 destToken->deleteThis();
             }