about summary refs log tree commit diff
path: root/ChangeLog
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2017-09-06 15:32:43 +0200
committerFlorian Weimer <fweimer@redhat.com>2017-09-06 15:32:43 +0200
commita83047308196e3e54716a39dd85c0a08b198d6bd (patch)
tree83d0c12c597f1b426c0c6b843763a64560c0a12a /ChangeLog
parent5670c4ab256114e869b1df4b05653aa5f909182c (diff)
downloadglibc-a83047308196e3e54716a39dd85c0a08b198d6bd.tar.gz
glibc-a83047308196e3e54716a39dd85c0a08b198d6bd.tar.xz
glibc-a83047308196e3e54716a39dd85c0a08b198d6bd.zip
resolv: __resolv_conf_attach must not free passed conf object [BZ #22096]
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog6
1 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 298f0fdcbd..6150ba16d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2017-09-06  Florian Weimer  <fweimer@redhat.com>
 
+	[BZ #22096]
+	* resolv/resolv_conf.c (__resolv_conf_attach): Do not free conf in
+	case of failure to obtain the global conf object.
+
+2017-09-06  Florian Weimer  <fweimer@redhat.com>
+
 	[BZ #22095]
 	* resolv/res_init.c (res_vinit_1): Avoid memory leak in case of
 	dynarray allocation failure.