[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15373] trunk/blender/source/blender: bugfix, txt_to_buf would crash on an empty text file.

Campbell Barton ideasman42 at gmail.com
Sat Jun 28 01:02:26 CEST 2008


Revision: 15373
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15373
Author:   campbellbarton
Date:     2008-06-28 01:01:33 +0200 (Sat, 28 Jun 2008)

Log Message:
-----------
bugfix, txt_to_buf would crash on an empty text file.
Also checked all other uses of text->lines.first to make sure the assumption isn't made elsewhere.
Added 2 more checks for text->lines.first when converting text buffer to objects.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/text.c
    trunk/blender/source/blender/src/editfont.c

Modified: trunk/blender/source/blender/blenkernel/intern/text.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/text.c	2008-06-27 19:55:08 UTC (rev 15372)
+++ trunk/blender/source/blender/blenkernel/intern/text.c	2008-06-27 23:01:33 UTC (rev 15373)
@@ -942,7 +942,8 @@
 	if (!text) return NULL;
 	if (!text->curl) return NULL;
 	if (!text->sell) return NULL;
-		
+	if (!text->lines.first) return NULL;
+
 	linef= text->lines.first;
 	charf= 0;
 		

Modified: trunk/blender/source/blender/src/editfont.c
===================================================================
--- trunk/blender/source/blender/src/editfont.c	2008-06-27 19:55:08 UTC (rev 15372)
+++ trunk/blender/source/blender/src/editfont.c	2008-06-27 23:01:33 UTC (rev 15373)
@@ -354,7 +354,7 @@
 //	char sdir[FILE_MAXDIR];
 //	char sfile[FILE_MAXFILE];
 
-	if(!text) return;
+	if(!text || !text->lines.first) return;
 
 	id = (ID *)text;
 
@@ -429,7 +429,7 @@
 	int linenum = 0;
 	float offset[3] = {0.0,0.0,0.0};
 
-	if(!text) return;
+	if(!text || !text->lines.first) return;
 
 	id = (ID *)text;
 





More information about the Bf-blender-cvs mailing list