diff options
| author | Florian Weimer <fweimer@redhat.com> | 2018-12-21 16:08:55 +0100 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2019-01-02 16:26:58 +0100 |
| commit | 8c1aafc1f34d090a5b41dc527c33e8687f6a1287 (patch) | |
| tree | ad64716032d4e4e01c4fda3e7f418da24957de2f | |
| parent | 66081e383c9b0008ff3a8fa40c15ab68a26f45b0 (diff) | |
| download | glibc-8c1aafc1f34d090a5b41dc527c33e8687f6a1287.tar.gz glibc-8c1aafc1f34d090a5b41dc527c33e8687f6a1287.tar.xz glibc-8c1aafc1f34d090a5b41dc527c33e8687f6a1287.zip | |
intl: Do not return NULL on asprintf failure in gettext [BZ #24018]
Fixes commit 9695dd0c9309712ed8e9c17a7040fe7af347f2dc ("DCIGETTEXT:
Use getcwd, asprintf to construct absolute pathname").
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | intl/dcigettext.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 846de9c0fd..8c08481d1e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2018-12-21 Florian Weimer <fweimer@redhat.com> + + [BZ #24018] + * intl/dcigettext.c (DCIGETTEXT): Do not return NULL on asprintf + failure. + 2019-01-02 Florian Weimer <fweimer@redhat.com> * nptl/tst-audit-threads.c: Switch to <support/test-driver.c>. diff --git a/intl/dcigettext.c b/intl/dcigettext.c index f22b37273f..4df93e2a8e 100644 --- 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 |