Mailinglist Archive: opensuse-commit (1774 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package Terminal for openSUSE:Factory
checked in at Fri Feb 11 02:15:48 CET 2011.



--------
--- Terminal/Terminal.changes   2011-02-04 00:00:29.000000000 +0100
+++ /mounts/work_src_done/STABLE/Terminal/Terminal.changes      2011-02-09 
17:34:02.000000000 +0100
@@ -1,0 +2,7 @@
+Wed Feb  9 16:02:43 UTC 2011 - gber@xxxxxxxxxxxx
+
+- added Terminal-0.4.6-prevent-null-pointer-dereference.patch which
+  prevents NULL pointer dereferences e.g. when changing themes
+  (bxo#7253)
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


New:
----
  Terminal-0.4.6-prevent-null-pointer-dereference.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ Terminal.spec ++++++
--- /var/tmp/diff_new_pack.a4rWTV/_old  2011-02-11 02:15:38.000000000 +0100
+++ /var/tmp/diff_new_pack.a4rWTV/_new  2011-02-11 02:15:38.000000000 +0100
@@ -19,7 +19,7 @@
 
 Name:           Terminal
 Version:        0.4.6
-Release:        1
+Release:        2
 License:        GPLv2+
 Summary:        Terminal emulator for the Xfce desktop environment
 Url:            http://goodies.xfce.org/projects/applications/terminal
@@ -29,6 +29,8 @@
 Patch0:         Terminal-0.4.5-honor-htmldir.patch
 # PATCH-FIX-UPSTREAM Terminal-0.4.6-fix-race.patch bxo#6921 gber@xxxxxxxxxxxx 
-- Avoids racing on the size-changed signal
 Patch1:         Terminal-0.4.6-fix-race.patch
+# PATCH-FIX-UPSTREAM Terminal-0.4.6-prevent-null-pointer-dereference.patch 
bxo#7253 -- Prevents NULL pointer dereferences e.g. when changing themes
+Patch2:         Terminal-0.4.6-prevent-null-pointer-dereference.patch
 BuildRequires:  intltool
 BuildRequires:  libpng-devel
 BuildRequires:  pkgconfig(dbus-1)
@@ -75,6 +77,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 xdt-autogen

++++++ Terminal-0.4.6-prevent-null-pointer-dereference.patch ++++++
> From 61440f863c00076eec981cd020659a4aadc19539 Mon Sep 17 00:00:00 2001
From: Lionel Le Folgoc <mrpouit@xxxxxxxxx>
Date: Tue, 08 Feb 2011 16:43:14 +0000
Subject: Protect against NULL borders (bug #7253).

---
diff --git a/terminal/terminal-screen.c b/terminal/terminal-screen.c
index fb447bb..a5312eb 100644
--- a/terminal/terminal-screen.c
+++ b/terminal/terminal-screen.c
@@ -1123,8 +1123,16 @@ terminal_screen_vte_resize_window (VteTerminal    
*terminal,
    * returns a size in pixels */
 #if VTE_CHECK_VERSION (0, 24, 0)
   gtk_widget_style_get (GTK_WIDGET (terminal), "inner-border", &border, NULL);
-  xpad = border->left + border->right;
-  ypad = border->top + border->bottom;
+  if (border != NULL)
+    {
+      xpad = border->left + border->right;
+      ypad = border->top + border->bottom;
+      gtk_border_free (border);
+    }
+  else
+    {
+      xpad = ypad = 0;
+    }
 #else
   vte_terminal_get_padding (terminal, &xpad, &ypad);
 #endif
@@ -1606,8 +1614,16 @@ terminal_screen_force_resize_window (TerminalScreen 
*screen,
 
 #if VTE_CHECK_VERSION (0, 24, 0)
   gtk_widget_style_get (GTK_WIDGET (screen->terminal), "inner-border", 
&border, NULL);
-  xpad = border->left + border->right;
-  ypad = border->top + border->bottom;
+  if (border != NULL)
+    {
+      xpad = border->left + border->right;
+      ypad = border->top + border->bottom;
+      gtk_border_free (border);
+    }
+  else
+    {
+      xpad = ypad = 0;
+    }
 #else
   vte_terminal_get_padding (VTE_TERMINAL (screen->terminal), &xpad, &ypad);
 #endif
--
cgit v0.8.3.4

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx