[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12069] trunk/blender/source/blender/src: Added a NULL check that was needed.

[Kent Mein]

Revision: 12069
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12069
Author:   sirdude
Date:     2007-09-17 17:39:03 +0200 (Mon, 17 Sep 2007)

Log Message:
-----------
Added a NULL check that was needed.

Kent

Modified Paths:
--------------
    trunk/blender/source/blender/src/filesel.c
    trunk/blender/source/blender/src/language.c

Modified: trunk/blender/source/blender/src/filesel.c
===================================================================
--- trunk/blender/source/blender/src/filesel.c	2007-09-17 15:32:10 UTC (rev 12068)
+++ trunk/blender/source/blender/src/filesel.c	2007-09-17 15:39:03 UTC (rev 12069)
@@ -806,8 +806,8 @@
 			struct LANGMenuEntry *lme;
        		lme = find_language(U.language);
 
-			if (!strcmp(lme->code, "ja_JP") || 
-				!strcmp(lme->code, "zh_CN"))
+			if ((lme !=NULL) && (!strcmp(lme->code, "ja_JP") || 
+				!strcmp(lme->code, "zh_CN")))
 			{
 				BIF_RasterPos((float)x, (float)y);
 #ifdef WIN32

Modified: trunk/blender/source/blender/src/language.c
===================================================================
--- trunk/blender/source/blender/src/language.c	2007-09-17 15:32:10 UTC (rev 12068)
+++ trunk/blender/source/blender/src/language.c	2007-09-17 15:39:03 UTC (rev 12069)
@@ -128,10 +128,12 @@
 				struct LANGMenuEntry *lme;
 				lme = find_language(U.language);
 
-				if (!strcmp(lme->code, "ja_JP"))
-					string_to_utf8(str, utf_8, "Shift_JIS");	/* Japanese */
-				else if (!strcmp(lme->code, "zh_CN"))
-					string_to_utf8(str, utf_8, "GB2312");		/* Chinese */
+				if (lme !=NULL) {
+					if (!strcmp(lme->code, "ja_JP"))
+						string_to_utf8(str, utf_8, "Shift_JIS");	/* Japanese */
+					else if (!strcmp(lme->code, "zh_CN"))
+						string_to_utf8(str, utf_8, "GB2312");		/* Chinese */
+				}
 	
 				return FTF_DrawString(utf_8, FTF_INPUT_UTF8);
 			}