summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2011-06-27 16:27:51 -0400
committerMatthias Clasen <mclasen@redhat.com>2011-06-27 16:27:51 -0400
commit13a7522cd21f9443a3329602d14ab28560494b0e (patch)
tree05ccfea73de8859645720452caa69ab05dbe6873
parent82e23cd837026369d55d1c8fc6267e2835586cd5 (diff)
downloadgdk-pixbuf-13a7522cd21f9443a3329602d14ab28560494b0e.tar.gz
2.23.52.23.5
-rw-r--r--NEWS8
-rw-r--r--configure.ac4
2 files changed, 10 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index ae3c29771..8b5132471 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+2.23.5
+======
+
+* Prevent the return of partically initialized pixbuf structures
+ from the gif loader in some error cases (CVE-2011-2485)
+
+* Win32 build updates
+
2.23.4
======
diff --git a/configure.ac b/configure.ac
index 529cb8f5a..d1b901fc5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,8 +15,8 @@ AC_PREREQ([2.63])
m4_define([gdk_pixbuf_major_version], [2])
m4_define([gdk_pixbuf_minor_version], [23])
-m4_define([gdk_pixbuf_micro_version], [4])
-m4_define([gdk_pixbuf_interface_age], [4])
+m4_define([gdk_pixbuf_micro_version], [5])
+m4_define([gdk_pixbuf_interface_age], [5])
m4_define([gdk_pixbuf_binary_age],
[m4_eval(100 * gdk_pixbuf_minor_version + gdk_pixbuf_micro_version)])
m4_define([gdk_pixbuf_version],