Merge lp:~wgrant/pygettextpo/bug-1269662 into lp:pygettextpo

[William Grant]

Fix set_msgstr, set_msgstr_plural and set_comments to not segfault when given None on gettext >= 0.18.2.

Fix set_msgstr, set_msgstr_plural and set_comments to not segfault when given None on gettext >= 0.18.2.

set_msgstr(None) tries to set the msgstr to NULL, despite po_message_set_msgstr being documented as taking a string, with "" being used to represent the lack of a translation. Despite being illegal, setting them to NULL works fine in old gettexts, as po_message_set_msgstr is a no-op if the value hasn't changed. However, gettext 0.18.2 switches the default strings in a message from NULL to "", so po_message_set_msgstr(msg, NULL) is no longer a no-op, and it segfaults.

[Celso Providelo (cprov)]

Looks very good, assuming the gettext version on precise will not choke when given empty strings instead of NULL (by the facts the documentation has not been extremely accurate in this subject).
Let's make LP way to trusty ...

review: Approve

[lp:~wgrant/pygettextpo/bug-1269662]

26. By William Grant on 2014-01-16

Fix check_format to bail out early if the msgid or msgstr are "" or None, to cope with the new "" default.

=== modified file 'gettextpo.c'
--- gettextpo.c	2009-06-02 15:31:25 +0000
+++ gettextpo.c	2014-01-16 03:06:38 +0000
@@ -610,7 +610,7 @@
         return NULL;
 
     if (object == Py_None) {
-        po_message_set_msgstr(self->msg, NULL);
+        po_message_set_msgstr(self->msg, "");
     } else {
         string = get_pystring_from_pyobject(object);
 
@@ -651,7 +651,7 @@
     }
 
     if (object == Py_None) {
-        po_message_set_msgstr_plural(self->msg, index, NULL);
+        po_message_set_msgstr_plural(self->msg, index, "");
     } else {
         string = get_pystring_from_pyobject(object);
 
@@ -683,7 +683,7 @@
         return NULL;
 
     if (object == Py_None) {
-        po_message_set_comments(self->msg, NULL);
+        po_message_set_comments(self->msg, "");
     } else {
         string = get_pystring_from_pyobject(object);
 
@@ -741,7 +741,9 @@
      * provide the same behaviour as old versions.
      */
     if (po_message_msgid(self->msg) == NULL ||
-	po_message_msgstr(self->msg) == NULL) {
+	strlen(po_message_msgid(self->msg)) == 0 ||
+	po_message_msgstr(self->msg) == NULL ||
+	strlen(po_message_msgstr(self->msg)) == 0) {
 	Py_RETURN_NONE;
     }