This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch release/2.28/master updated. glibc-2.28-66-gbee4baf
- From: fw at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 2 Jan 2019 16:03:20 -0000
- Subject: GNU C Library master sources branch release/2.28/master updated. glibc-2.28-66-gbee4baf
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, release/2.28/master has been updated
via bee4baf6d7a1055f7e2819209e722c6effc9c1bf (commit)
from 8f83d095fabf9e3e9e23023a010e50a21810d918 (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=bee4baf6d7a1055f7e2819209e722c6effc9c1bf
commit bee4baf6d7a1055f7e2819209e722c6effc9c1bf
Author: Florian Weimer <fweimer@redhat.com>
Date: Wed Jan 2 16:46:12 2019 +0100
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 ec7dcc6..8de81aa 100644
--- 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 d350d46..865c075 100644
--- 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 2a50369..25f47c5 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 ++++++
NEWS | 1 +
intl/dcigettext.c | 2 +-
3 files changed, 8 insertions(+), 1 deletions(-)
hooks/post-receive
--
GNU C Library master sources