Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoilnen Leite <joilnen.leite@gmail.com>2005-05-19 03:54:56 +0400
committerJoilnen Leite <joilnen.leite@gmail.com>2005-05-19 03:54:56 +0400
commitc1936cff6007692cc13d17e4ec7a3f26a4c646f5 (patch)
treef8de0b3010b88f7d79196883526f4f6fe766a1c1
parent35ee2c2b4e6345ba3887bacf7f3bff24b12789fd (diff)
fixed it sending null to MEM_freeN
.
-rw-r--r--source/blender/blenkernel/intern/text.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c
index 29144b84d70..be2cfc6ba5d 100644
--- a/source/blender/blenkernel/intern/text.c
+++ b/source/blender/blenkernel/intern/text.c
@@ -440,8 +440,8 @@ Text *copy_text(Text *ta)
static void make_new_line (TextLine *line, char *newline, char *newformat)
{
- MEM_freeN(line->line);
- MEM_freeN(line->format);
+ if (line->line) MEM_freeN(line->line);
+ if (line->format) MEM_freeN(line->format);
line->line= newline;
line->len= strlen(newline);
@@ -2005,7 +2005,6 @@ int txt_add_char (Text *text, char add) {
len= text->curl->len - text->curc;
if(len>0) memcpy(tmp+text->curc+1, text->curl->line+text->curc, len);
tmp[text->curl->len+1]=0;
-
make_new_line(text->curl, tmp, format);
text->curc++;