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