[Libreoffice-commits] core.git: 2 commits - vcl/qa vcl/unx

[Caolán McNamara]

 vcl/qa/cppunit/graphicfilter/data/png/fail/CVE-2016-0951-2.png |    1 +
 vcl/qa/cppunit/graphicfilter/data/png/pass/CVE-2016-0951-1.png |    1 +
 vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx                      |    9 +++------
 3 files changed, 5 insertions(+), 6 deletions(-)

New commits:
commit b3a0a9cbb489e9c1b21df6d92c1f40305286d2d2
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Feb 12 09:43:09 2016 +0000

    add CVE-2016-0951 testcases
    
    Change-Id: I50ca91f95557b48bb5a55f459c2a6053d2fe8d85

diff --git a/vcl/qa/cppunit/graphicfilter/data/png/fail/CVE-2016-0951-2.png b/vcl/qa/cppunit/graphicfilter/data/png/fail/CVE-2016-0951-2.png
new file mode 100644
index 0000000..38899f7
--- /dev/null
+++ b/vcl/qa/cppunit/graphicfilter/data/png/fail/CVE-2016-0951-2.png
@@ -0,0 +1 @@
+Àœë#Mb£Š}ÕÔo7ë2ΰ~XÍù.^@Jäiè„#åüß+p¨%çHh¢/Ù¦ô‹0!0õ‚
òþõ{Ã¥ï¶
Œ[¦ÜB…]2ÓŒ*[»@Κâæ}¾{` RötÔ´Ž|}ø·Ï3ëÁ€N=aè‰DúITÇgI‰ã!³…Ò¨C]ˍõÍÀ†ûïÚ	 åˆíEr–GOXÕö°9ò	Ì“øˆÏ^Œ;²0/Aî±ìî)¢O²"vg Ӎº¹jõ”«1•»èá¨{b*[¼›o:Ù–ƒw*^_ˉœöi8˜¨¼d°q?]þ0Û}È´‰
á$õ}Ñê|6Es0
”x%mL¤ à-Àm¹÷÷ë:ÓÒÄæ
\ No newline at end of file
diff --git a/vcl/qa/cppunit/graphicfilter/data/png/pass/CVE-2016-0951-1.png b/vcl/qa/cppunit/graphicfilter/data/png/pass/CVE-2016-0951-1.png
new file mode 100644
index 0000000..b5e6220
--- /dev/null
+++ b/vcl/qa/cppunit/graphicfilter/data/png/pass/CVE-2016-0951-1.png
@@ -0,0 +1 @@
+Àœë#Mb£Š}ÕÔo7ë2Ε~Xèë._ÁÍãâè„#åüß+p¨±çHh¢/ÙG%òƒL¹¹Ö69lÂî±µ˜R?Y‘Š’¼¸ÖæôÑ)Rȍ€ôAÙólþ7½„*…’[.óïþ{òýH
–Þá‚ÒçZ#á£
\ No newline at end of file
commit 8bd00a69af3c1b5afab43be4857fb11adde3070f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Feb 12 09:24:16 2016 +0000

    gtk_icon_info_free is deprecated
    
    Change-Id: I7e5494d3a8c8e16da3864d14a9194c430d42202e

diff --git a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
index 54f783a..33117b0 100644
--- a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
@@ -592,11 +592,9 @@ void GtkSalGraphics::PaintOneSpinButton( GtkStyleContext *context,
     GtkIconInfo *info = gtk_icon_theme_lookup_icon(pIconTheme, icon, std::min(iconWidth, iconHeight),
                                                    static_cast<GtkIconLookupFlags>(0));
 
-    GdkPixbuf *pixbuf = gtk_icon_info_load_symbolic_for_context
-                                                        (info,
-                                                         context,
-                                                         nullptr,
-                                                         nullptr);
+    GdkPixbuf *pixbuf = gtk_icon_info_load_symbolic_for_context(info, context, nullptr, nullptr);
+    g_object_unref(info);
+
     iconWidth = gdk_pixbuf_get_width(pixbuf);
     iconHeight = gdk_pixbuf_get_height(pixbuf);
     Rectangle arrowRect;
@@ -606,7 +604,6 @@ void GtkSalGraphics::PaintOneSpinButton( GtkStyleContext *context,
 
     gtk_render_icon(context, cr, pixbuf, arrowRect.Left(), arrowRect.Top());
     g_object_unref(pixbuf);
-    gtk_icon_info_free(info);
 }
 
 Rectangle GtkSalGraphics::PaintSpinButton(GtkStyleContext *context,