From 79652f4c79e76d8999478ec5b8027ccb742a4bb3 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Tue, 16 Jun 2015 19:28:40 +0000
Subject: crash fix

git-svn-id: http://svn.miranda-ng.org/main/trunk@14217 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 src/mir_core/src/mstring.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/mir_core/src/mstring.cpp b/src/mir_core/src/mstring.cpp
index 3cb52eef61..1ce935a2e3 100644
--- a/src/mir_core/src/mstring.cpp
+++ b/src/mir_core/src/mstring.cpp
@@ -68,7 +68,8 @@ MIR_CORE_DLL(CMStringData*) mirstr_allocate(int nChars, int nCharSize)
 
 MIR_CORE_DLL(void) mirstr_free(CMStringData *pData)
 {
-	free(pData);
+	if (pData != &m_nil)
+		free(pData);
 }
 
 MIR_CORE_DLL(CMStringData*) mirstr_realloc(CMStringData* pData, int nChars, int nCharSize)
-- 
cgit v1.2.3