xgettext: C: Fix undefined behaviour.

* gettext-tools/src/x-c.c (phase7_getc): Declare n as 'unsigned int', to avoid
signed integer overflow.
* gettext-tools/tests/xg-c-escape-3.c: Add two more test cases.
* gettext-tools/tests/xgettext-c-escape-3: Update expected test result.

diff --git a/gettext-tools/src/x-c.c b/gettext-tools/src/x-c.c
index d4fe6c4d18bb917756b7a0d327ab44fca2979e0e..7b43c245f170ab7a24f72546d6b88ee3ade03ddc 100644 (file)
--- a/gettext-tools/src/x-c.c
+++ b/gettext-tools/src/x-c.c
@@ -1171,7 +1171,7 @@ phase7_getc ()
     case 'U': case 'u':
       {
         unsigned char buf[8];
-        int n;
+        unsigned int n;
 
         n = 0;
         for (j = 0; j < (c == 'u' ? 4 : 8); j++)

diff --git a/gettext-tools/tests/xg-c-escape-3.c b/gettext-tools/tests/xg-c-escape-3.c
index fc95e5da9e2747fbeedc6c96505500b76f9e8eac..520094595def4709c36cbf5e918f1f414fb5e949 100644 (file)
Binary files a/gettext-tools/tests/xg-c-escape-3.c and b/gettext-tools/tests/xg-c-escape-3.c differ

diff --git a/gettext-tools/tests/xgettext-c-escape-3 b/gettext-tools/tests/xgettext-c-escape-3
index 5f9967d576eabdd9e9557720924f5fd3714abdc7..69a041584462bfdc72b39e76063319f348117269 100755 (executable)
--- a/gettext-tools/tests/xgettext-c-escape-3
+++ b/gettext-tools/tests/xgettext-c-escape-3
@@ -69,6 +69,12 @@ msgstr ""
 
 msgid "14abc\\u567"
 msgstr ""
+
+msgid "15abc\\U01234567"
+msgstr ""
+
+msgid "16abc\\U9FFFFFFF"
+msgstr ""
 EOF
 
 : ${DIFF=diff}