This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.28.9000-515-g8c1aafc
- From: fw at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 2 Jan 2019 15:44:02 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.28.9000-515-g8c1aafc
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 8c1aafc1f34d090a5b41dc527c33e8687f6a1287 (commit)
from 66081e383c9b0008ff3a8fa40c15ab68a26f45b0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=8c1aafc1f34d090a5b41dc527c33e8687f6a1287
commit 8c1aafc1f34d090a5b41dc527c33e8687f6a1287
Author: Florian Weimer <fweimer@redhat.com>
Date: Fri Dec 21 16:08:55 2018 +0100
intl: Do not return NULL on asprintf failure in gettext [BZ #24018]
Fixes commit 9695dd0c9309712ed8e9c17a7040fe7af347f2dc ("DCIGETTEXT:
Use getcwd, asprintf to construct absolute pathname").
diff --git a/ChangeLog b/ChangeLog
index 846de9c..8c08481 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 f22b372..4df93e2 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
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 6 ++++++
intl/dcigettext.c | 2 +-
2 files changed, 7 insertions(+), 1 deletions(-)
hooks/post-receive
--
GNU C Library master sources