Hello,

I'm doing an NMU of gnomesword to fix #352905; diff attached.

Thanks,

Matej
diff -u gnomesword-2.1.5/debian/changelog gnomesword-2.1.5/debian/changelog
--- gnomesword-2.1.5/debian/changelog
+++ gnomesword-2.1.5/debian/changelog
@@ -1,3 +1,11 @@
+gnomesword (2.1.5-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * debian/patches/handle_unset_lang.diff: Don't crash if LANG is not set
+    in the environment.  Closes: #352905.
+
+ -- Matej Vela <[EMAIL PROTECTED]>  Thu, 23 Feb 2006 09:37:09 +0100
+
 gnomesword (2.1.5-1) unstable; urgency=low
 
   * New upstream dev release
only in patch2:
unchanged:
--- gnomesword-2.1.5.orig/debian/patches/series
+++ gnomesword-2.1.5/debian/patches/series
@@ -0,0 +1 @@
+handle_unset_lang.diff
only in patch2:
unchanged:
--- gnomesword-2.1.5.orig/debian/patches/handle_unset_lang.diff
+++ gnomesword-2.1.5/debian/patches/handle_unset_lang.diff
@@ -0,0 +1,35 @@
+Index: gnomesword-2.1.5/src/backend/sword_main.cc
+===================================================================
+--- gnomesword-2.1.5.orig/src/backend/sword_main.cc    2005-12-12 
22:23:33.000000000 +0100
++++ gnomesword-2.1.5/src/backend/sword_main.cc 2006-02-23 09:30:25.000000000 
+0100
+@@ -146,7 +146,7 @@
+       char *retval = NULL;
+       char buf[32];
+       int i = 0;
+-      SWLocale *sw_locale;
++      SWLocale *sw_locale = NULL;
+       
+       if(sys_locale) {
+               if(!strncmp(sys_locale,"ru_RU",5)) {
+Index: gnomesword-2.1.5/src/main/sword.cc
+===================================================================
+--- gnomesword-2.1.5.orig/src/main/sword.cc    2005-12-12 22:22:34.000000000 
+0100
++++ gnomesword-2.1.5/src/main/sword.cc 2006-02-23 09:31:13.000000000 +0100
+@@ -458,11 +458,13 @@
+       g_print("OLD_CODESET = %s\n\n", OLD_CODESET);
+       g_print("%s\n", _("Checking for SWORD Modules"));
+ #endif
+-      sys_locale = strdup(lang);
+-      settings.spell_language = strdup(sys_locale);   
++      sys_locale = lang ? strdup(lang) : NULL;
++      settings.spell_language = sys_locale ? strdup(sys_locale) : NULL;
+       main_init_lists();
+-      free((char*)sword_locale);
+-      free(sys_locale);       
++      if (sword_locale)
++              free((char*)sword_locale);
++      if (sys_locale)
++              free(sys_locale);
+ }
+ 
+ 

Reply via email to