summaryrefslogtreecommitdiff
path: root/src/mir_core
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2015-06-16 19:28:40 +0000
committerGeorge Hazan <george.hazan@gmail.com>2015-06-16 19:28:40 +0000
commit79652f4c79e76d8999478ec5b8027ccb742a4bb3 (patch)
treed6158ed2a5f68f3616ff4ac6969a8615d234b63a /src/mir_core
parent8cb115396836c67ef916e70c13fee2d1d018d838 (diff)
crash fix
git-svn-id: http://svn.miranda-ng.org/main/trunk@14217 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'src/mir_core')
-rw-r--r--src/mir_core/src/mstring.cpp3
1 files changed, 2 insertions, 1 deletions
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)