← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/openoffice.org/gutsy-updates

« back to all changes in this revision

Viewing changes to ooo-build/patches/src680/ooo82608.vcl.gtkbadfree.diff

  • Committer: Bazaar Package Importer
  • Author(s): Kees Cook, Chris Cheney, Kees Cook
  • Date: 2008-04-21 17:35:13 UTC
  • mfrom: (87.1.3 gutsy-proposed)
  • Revision ID: james.westby@ubuntu.com-20080421173513-9pmadexneaqrtgrx
Tags: 1:2.3.0-1ubuntu5.4
[ Chris Cheney ]
* ooo-build/patches/src680/workspace.fwk82.diff,
  ooo-build/patches/src680/workspace.sjfixes03.diff: fix CVE-2007-5745,
  CVE-2007-5746,CVE-2007-5747 and CVE-2008-0320
* ooo-build/patches/src680/cws-jl85.diff: fix XML signing problem where
  the document can be manipulated so that the signature dialog display a
  false issuer

[ Kees Cook ]
* ooo-build/patches/src680/workspace.hsql1808.diff: upstream fixes for
  HSQLDB Java method calling (CVE-2007-4575), thanks to Caolan McNamara.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ooo-build/patches/src680/ooo82608.vcl.gtkbadfree.diff
 
1
Index: unx/gtk/gdi/salnativewidgets-gtk.cxx
 
2
===================================================================
 
3
RCS file: /cvs/gsl/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx,v
 
4
retrieving revision 1.39
 
5
diff -u -r1.39 salnativewidgets-gtk.cxx
 
6
--- vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx    3 Jul 2007 14:06:42 -0000       1.39
 
7
+++ vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx    19 Oct 2007 08:46:59 -0000
 
8
@@ -2898,9 +2899,9 @@
 
9
     aPartRect = Rectangle( aPartPos, aPartSize );
 
10
 
 
11
        if ( pIndicatorSize )
 
12
-               g_free( pIndicatorSize );
 
13
+               gtk_requisition_free( pIndicatorSize );
 
14
        if ( pIndicatorSpacing )
 
15
-               g_free( pIndicatorSpacing );
 
16
+               gtk_border_free( pIndicatorSpacing );
 
17
 
 
18
        return( aPartRect );
 
19
 }
 
20
@@ -2947,9 +2948,9 @@
 
21
                aIndicatorRect.Move( 0, 1 );
 
22
 
 
23
        if ( pIndicatorSize )
 
24
-               g_free( pIndicatorSize );
 
25
+               gtk_requisition_free( pIndicatorSize );
 
26
        if ( pIndicatorSpacing )
 
27
-               g_free( pIndicatorSpacing );
 
28
+               gtk_border_free( pIndicatorSpacing );
 
29
 
 
30
        return( aIndicatorRect );
 
31
 }