intl: Do not return NULL on asprintf failure in gettext [BZ #24018]

Fixes commit 9695dd0c9309712ed8e9c17a7040fe7af347f2dc ("DCIGETTEXT:
Use getcwd, asprintf to construct absolute pathname").

(cherry picked from commit 8c1aafc1f34d090a5b41dc527c33e8687f6a1287)

diff --git a/ChangeLog b/ChangeLog
index ec7dcc67b278f7eafac9b132d8ce68dd36110ddb..8de81aa559ff1ad7e3760c57e5e9c0ae7319048e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2019-01-02  Florian Weimer  <fweimer@redhat.com>
+
+       [BZ #24018]
+       * intl/dcigettext.c (DCIGETTEXT): Do not return NULL on asprintf
+       failure.
+
 2018-12-31  Florian Weimer  <fw@deneb.enyo.de>
 
        [BZ #24027]

diff --git a/NEWS b/NEWS
index d350d4666a845fef014a23b5b084976bc778f0a5..865c075c8201f30ed8b45a40a1906c925948e945 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -28,6 +28,7 @@ The following bugs are resolved with this release:
   [23822] ia64 static libm.a is missing exp2f, log2f and powf symbols
   [23927] Linux if_nametoindex() does not close descriptor (CVE-2018-19591)
   [23972] __old_getdents64 uses wrong d_off value on overflow
+  [24018] gettext may return NULL
   [24027] malloc: Integer overflow in realloc
 
 Security related changes:

diff --git a/intl/dcigettext.c b/intl/dcigettext.c
index 2a5036994824875b4db6b2e5ca7063a563903a2a..25f47c5bd3b0ea0482042fd460c67258c0d10aa5 100644 (file)
--- a/intl/dcigettext.c
+++ b/intl/dcigettext.c
@@ -631,7 +631,7 @@ DCIGETTEXT (const char *domainname, const char *msgid1, const char *msgid2,
          int ret = __asprintf (&xdirname, "%s/%s", cwd, dirname);
          free (cwd);
          if (ret < 0)
-             return NULL;
+           goto return_untranslated;
          dirname = xdirname;
        }
 #ifndef IN_LIBGLOCALE