diff --git a/debian/changelog b/debian/changelog index aa80694a4f3e21148b51112a1ac2f80fcc806bae..fb8228007769059eebc000e2f0e56b7acbdd4993 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +glib2.0 (2.42.1-1+deb8u3) jessie-security; urgency=medium + + * CVE-2019-13012: Update CVE-2019-13012-1.patch. Fix memleak regression + spotted by Simon McVittie. (Closes: #933877). + + -- Mike Gabriel <sunweaver@debian.org> Mon, 05 Aug 2019 20:58:34 +0200 + glib2.0 (2.42.1-1+deb8u2) jessie-security; urgency=medium * Non-maintainer upload by the LTS team. diff --git a/debian/patches/CVE-2019-13012-1.patch b/debian/patches/CVE-2019-13012-1.patch index 0a19e4c3a4b1ed28b9ee26d5656adffbbe57e2f7..23666eed9ab94c67f41b5f87a3d648c15c8874e6 100644 --- a/debian/patches/CVE-2019-13012-1.patch +++ b/debian/patches/CVE-2019-13012-1.patch @@ -11,12 +11,22 @@ Origin: https://gitlab.gnome.org/GNOME/glib/commit/5e4da714f00f6bfb2ccd6d73d6132 --- a/gio/gkeyfilesettingsbackend.c +++ b/gio/gkeyfilesettingsbackend.c -@@ -640,7 +640,7 @@ +@@ -627,6 +627,7 @@ + const gchar *root_group) + { + GKeyfileSettingsBackend *kfsb; ++ char *dir; + + g_return_val_if_fail (filename != NULL, NULL); + g_return_val_if_fail (root_path != NULL, NULL); +@@ -640,7 +641,9 @@ kfsb->file = g_file_new_for_path (filename); kfsb->dir = g_file_get_parent (kfsb->file); - g_file_make_directory_with_parents (kfsb->dir, NULL, NULL); -+ g_mkdir_with_parents (g_file_get_path (kfsb->dir), 0700); ++ dir = g_file_get_path (kfsb->dir); ++ g_mkdir_with_parents (dir, 0700); ++ g_free (dir); kfsb->file_monitor = g_file_monitor (kfsb->file, 0, NULL, NULL); kfsb->dir_monitor = g_file_monitor (kfsb->dir, 0, NULL, NULL);