rpms
/
wxGTK
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- update to 2.8.11

This commit is contained in:
Dan Horák 2010-04-26 09:54:22 +00:00
parent 70e355d823
commit a6dd008d51
7 changed files with 7 additions and 206 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1 +1 @@
wxGTK-2.8.10.tar.bz2
wxGTK-2.8.11.tar.bz2

2
sources
View File

@ -1 +1 @@
88b867bc118a183af56efc67014bdf27 wxGTK-2.8.10.tar.bz2
6040933d200037f90f6aa1c5169e7ec6 wxGTK-2.8.11.tar.bz2

75
wxGTK-2.8.10-CVE-2009-2369.patch
View File

@ -1,75 +0,0 @@
Index: src/common/imagpng.cpp
===================================================================
--- src/common/imagpng.cpp (revision 60874)
+++ src/common/imagpng.cpp (revision 60875)
@@ -568,18 +568,16 @@
if (!image->Ok())
goto error;
- lines = (unsigned char **)malloc( (size_t)(height * sizeof(unsigned char *)) );
+ // initialize all line pointers to NULL to ensure that they can be safely
+ // free()d if an error occurs before all of them could be allocated
+ lines = (unsigned char **)calloc(height, sizeof(unsigned char *));
if ( !lines )
goto error;
for (i = 0; i < height; i++)
{
if ((lines[i] = (unsigned char *)malloc( (size_t)(width * (sizeof(unsigned char) * 4)))) == NULL)
- {
- for ( unsigned int n = 0; n < i; n++ )
- free( lines[n] );
goto error;
- }
}
png_read_image( png_ptr, lines );
Index: src/common/imagtiff.cpp
===================================================================
--- src/common/imagtiff.cpp (revision 60875)
+++ src/common/imagtiff.cpp (revision 60876)
@@ -261,7 +261,6 @@
}
uint32 w, h;
- uint32 npixels;
uint32 *raster;
TIFFGetField( tif, TIFFTAG_IMAGEWIDTH, &w );
@@ -275,10 +274,21 @@
(samplesInfo[0] == EXTRASAMPLE_ASSOCALPHA ||
samplesInfo[0] == EXTRASAMPLE_UNASSALPHA));
- npixels = w * h;
+ // guard against integer overflow during multiplication which could result
+ // in allocating a too small buffer and then overflowing it
+ const double bytesNeeded = w * h * sizeof(uint32);
+ if ( bytesNeeded >= 4294967295U /* UINT32_MAX */ )
+ {
+ if ( verbose )
+ wxLogError( _("TIFF: Image size is abnormally big.") );
- raster = (uint32*) _TIFFmalloc( npixels * sizeof(uint32) );
+ TIFFClose(tif);
+ return false;
+ }
+
+ raster = (uint32*) _TIFFmalloc( bytesNeeded );
+
if (!raster)
{
if (verbose)
Index: src/common/imagtiff.cpp
===================================================================
--- src/common/imagtiff.cpp (revision 60896)
+++ src/common/imagtiff.cpp (revision 60897)
@@ -276,7 +276,7 @@
// guard against integer overflow during multiplication which could result
// in allocating a too small buffer and then overflowing it
- const double bytesNeeded = w * h * sizeof(uint32);
+ const double bytesNeeded = (double)w * (double)h * sizeof(uint32);
if ( bytesNeeded >= 4294967295U /* UINT32_MAX */ )
{
if ( verbose )

20
wxGTK-2.8.10-htmltable.patch
View File

@ -1,20 +0,0 @@
Index: src/html/m_tables.cpp
===================================================================
--- src/html/m_tables.cpp (revision 59686)
+++ src/html/m_tables.cpp (revision 59687)
@@ -684,6 +684,7 @@
{
wxHtmlTableCell *oldt = m_Table;
+ wxHtmlContainerCell *oldEnclosing = m_enclosingContainer;
m_enclosingContainer = c = m_WParser->OpenContainer();
m_Table = new wxHtmlTableCell(c, tag, m_WParser->GetPixelScale());
@@ -722,6 +723,7 @@
m_WParser->CloseContainer();
m_Table = oldt;
+ m_enclosingContainer = oldEnclosing;
return true; // ParseInner() called
}

55
wxGTK-2.8.10-menubar-height.patch
View File

@ -1,55 +0,0 @@
Index: src/gtk/frame.cpp
===================================================================
--- src/gtk/frame.cpp (revision 62486)
+++ src/gtk/frame.cpp (revision 62487)
@@ -78,6 +78,30 @@
}
}
+//-----------------------------------------------------------------------------
+// "size-request" from menubar
+//-----------------------------------------------------------------------------
+
+extern "C" {
+static void menubar_size_request(GtkWidget* widget, GtkRequisition*, wxFrame* win)
+{
+ g_signal_handlers_disconnect_by_func(
+ widget, (void*)menubar_size_request, win);
+ win->UpdateMenuBarSize();
+}
+}
+
+//-----------------------------------------------------------------------------
+// "style-set" from menubar
+//-----------------------------------------------------------------------------
+
+extern "C" {
+static void menubar_style_set(GtkWidget* widget, GtkStyle*, wxFrame* win)
+{
+ g_signal_connect(widget, "size-request",
+ G_CALLBACK(menubar_size_request), win);
+}
+}
#endif // wxUSE_MENUS_NATIVE
#if wxUSE_TOOLBAR
@@ -571,6 +595,9 @@
if ( m_frameMenuBar )
{
+ g_signal_handlers_disconnect_by_func(
+ m_frameMenuBar->m_widget, (void*)menubar_style_set, this);
+
m_frameMenuBar->UnsetInvokingWindow( this );
if (m_frameMenuBar->GetWindowStyle() & wxMB_DOCKABLE)
@@ -621,6 +648,9 @@
gtk_widget_show( m_frameMenuBar->m_widget );
UpdateMenuBarSize();
+
+ g_signal_connect(menuBar->m_widget, "style-set",
+ G_CALLBACK(menubar_style_set), this);
}
else
{

39
wxGTK-2.8.10-wxTimer-fix.patch
View File

@ -1,39 +0,0 @@
Index: src/gtk/app.cpp
===================================================================
--- src/gtk/app.cpp (revision 62396)
+++ src/gtk/app.cpp (revision 62397)
@@ -149,9 +149,11 @@
// One-shot emission hook for "event" signal, to install idle handler.
// This will be called when the "event" signal is issued on any GtkWidget object.
static gboolean
-event_emission_hook(GSignalInvocationHint*, guint, const GValue*, gpointer)
+event_emission_hook(GSignalInvocationHint*, guint, const GValue*, gpointer data)
{
wxapp_install_idle_handler();
+ bool* hook_installed = (bool*)data;
+ *hook_installed = false;
// remove hook
return false;
}
@@ -159,12 +161,17 @@
// add emission hook for "event" signal, to re-install idle handler when needed
static inline void wxAddEmissionHook()
{
+ static bool hook_installed;
GType widgetType = GTK_TYPE_WIDGET;
- // if GtkWidget type is loaded
- if (g_type_class_peek(widgetType) != NULL)
+ // if hook not installed and GtkWidget type is loaded
+ if (!hook_installed && g_type_class_peek(widgetType))
{
- guint sig_id = g_signal_lookup("event", widgetType);
- g_signal_add_emission_hook(sig_id, 0, event_emission_hook, NULL, NULL);
+ static guint sig_id;
+ if (sig_id == 0)
+ sig_id = g_signal_lookup("event", widgetType);
+ hook_installed = true;
+ g_signal_add_emission_hook(
+ sig_id, 0, event_emission_hook, &hook_installed, NULL);
}
}

20
wxGTK.spec
View File

@ -1,21 +1,12 @@
Name: wxGTK
Version: 2.8.10
Release: 5%{?dist}
Version: 2.8.11
Release: 1%{?dist}
Summary: GTK2 port of the wxWidgets GUI library
License: wxWidgets
Group: System Environment/Libraries
URL: http://www.wxwidgets.org/
Source0: http://dl.sf.net/wxwindows/%{name}-%{version}.tar.bz2
# http://trac.wxwidgets.org/ticket/10993
Patch0: %{name}-2.8.10-CVE-2009-2369.patch
# http://trac.wxwidgets.org/ticket/11315
Patch1: %{name}-2.8.10-wxTimer-fix.patch
# http://trac.wxwidgets.org/ticket/11310
Patch2: %{name}-2.8.10-menubar-height.patch
# http://trac.wxwidgets.org/ticket/10370 (#534030)
Patch3: %{name}-2.8.10-htmltable.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtk2-devel, zlib-devel >= 1.1.4
@ -82,10 +73,6 @@ libraries or the X Window System.
%prep
%setup -q -n %{name}-%{version}
%patch0 -p0 -b .CVE-2009-2369
%patch1 -p0 -b .wxTimer-fix
%patch2 -p0 -b .menubar-height
%patch3 -p0 -b .htmltable
sed -i -e 's|/usr/lib\b|%{_libdir}|' wx-config.in configure
@ -224,6 +211,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Mon Apr 26 2010 Dan Horák <dan[at]danny.cz> - 2.8.11-1
- update to 2.8.11
* Tue Nov 10 2009 Dan Horák <dan[at]danny.cz> - 2.8.10-5
- added fix for html tables rendering (#534030)
- removed the long time disabled odbc subpackage