bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

fix for crash reading console history.

Browse Source
This commit is contained in:
Campbell Barton 2010-04-24 21:14:05 +00:00
parent 4bd3163ea6
commit 265d76a533
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/blenloader/intern/readfile.c
View File

@ -5169,7 +5169,7 @@ static void direct_link_screen(FileData *fd, bScreen *sc)
} }
else if(sl->spacetype==SPACE_CONSOLE) { else if(sl->spacetype==SPACE_CONSOLE) {
SpaceConsole *sconsole= (SpaceConsole *)sl; SpaceConsole *sconsole= (SpaceConsole *)sl;
ConsoleLine *cl, *clnext; ConsoleLine *cl, *cl_next;
link_list(fd, &sconsole->scrollback); link_list(fd, &sconsole->scrollback);
link_list(fd, &sconsole->history); link_list(fd, &sconsole->history);
@ -5180,9 +5180,10 @@ static void direct_link_screen(FileData *fd, bScreen *sc)
/*comma expressions, (e.g. expr1, expr2, expr3) evalutate each expression, /*comma expressions, (e.g. expr1, expr2, expr3) evalutate each expression,
from left to right. the right-most expression sets the result of the comma from left to right. the right-most expression sets the result of the comma
expression as a whole*/ expression as a whole*/
for(cl= sconsole->history.first; cl && (clnext=cl->next); cl= clnext) { for(cl= sconsole->history.first; cl; cl= cl_next) {
cl_next= cl->next;
cl->line= newdataadr(fd, cl->line); cl->line= newdataadr(fd, cl->line);
if (!cl->line) { if (cl->line == NULL) {
BLI_remlink(&sconsole->history, cl); BLI_remlink(&sconsole->history, cl);
MEM_freeN(cl); MEM_freeN(cl);
} }