[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45615] trunk/blender/source/blender/ blenfont/intern/blf_translation.c: Grmph, BLF_(p) gettext were not protected against NULL message/context, was causing a sigsev with latest own commits (in File menu)!

[Bastien Montagne]

Revision: 45615
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45615
Author:   mont29
Date:     2012-04-13 20:58:59 +0000 (Fri, 13 Apr 2012)
Log Message:
-----------
Grmph, BLF_(p)gettext were not protected against NULL message/context, was causing a sigsev with latest own commits (in File menu)!

Modified Paths:
--------------
    trunk/blender/source/blender/blenfont/intern/blf_translation.c

Modified: trunk/blender/source/blender/blenfont/intern/blf_translation.c
===================================================================
--- trunk/blender/source/blender/blenfont/intern/blf_translation.c	2012-04-13 20:25:05 UTC (rev 45614)
+++ trunk/blender/source/blender/blenfont/intern/blf_translation.c	2012-04-13 20:58:59 UTC (rev 45615)
@@ -93,7 +93,7 @@
 const char* BLF_gettext(const char *msgid)
 {
 #ifdef WITH_INTERNATIONAL
-	if (msgid[0])
+	if (msgid && msgid[0])
 		return gettext(msgid);
 	return "";
 #else
@@ -111,6 +111,9 @@
 
 	size_t overall_length = strlen(context) + strlen(message) + sizeof(GETTEXT_CONTEXT_GLUE) + 1;
 
+	if (!message || !context || !message[0])
+		return "";
+
 	if (overall_length > sizeof(static_msg_ctxt_id)) {
 		dynamic_msg_ctxt_id = malloc(overall_length);
 		msg_ctxt_id = dynamic_msg_ctxt_id;