Are you pushing this upstream?

Laca

On Thu, 2009-04-30 at 18:08 +0100, Ghee Teo wrote:
> A fix for
> 
> http://defect.opensolaris.org/bz/show_bug.cgi?id=8554
> 
> when gnome-session-save is run, from time to time it got badly formed 
> application name and that can cause gnome-session to crash.
> The fix is to make sure that it doesn't try to convert an null prop 
> structure.
> 
> -Ghee
> 
> bash-3.2$ svn diff
> Index: patches/gnome-session-16-null-prop-name.diff
> ===================================================================
> --- patches/gnome-session-16-null-prop-name.diff        (revision 0)
> +++ patches/gnome-session-16-null-prop-name.diff        (revision 0)
> @@ -0,0 +1,13 @@
> +diff -urN gnome-session-2.26.1/gnome-session/gsm-xsmp-client.c 
> ../SUNWgnome-session-2.26.1.hacked/gnome-session-2.26.1/gnome-session/gsm-xsmp-client.c
> +--- gnome-session-2.26.1/gnome-session/gsm-xsmp-client.c       
> 2009-04-30 16:31:31.198605588 +0100
> ++++ 
> ../SUNWgnome-session-2.26.1.hacked/gnome-session-2.26.1/gnome-session/gsm-xsmp-client.c
>     
> 2009-04-30 16:47:46.285472714 +0100
> +@@ -784,6 +784,9 @@
> +         char   *name;
> +
> +         prop = find_property (GSM_XSMP_CLIENT (client), SmProgram, NULL);
> ++        if (!prop)
> ++                return NULL;
> ++
> +         name = prop_to_command (prop);
> +
> +         return name;
> Index: base-specs/gnome-session.spec
> ===================================================================
> --- base-specs/gnome-session.spec       (revision 18214)
> +++ base-specs/gnome-session.spec       (working copy)
> @@ -60,6 +60,8 @@
>  Patch14:     gnome-session-14-bad-clients.diff
>  #owner:gheet date:2009-04-07 type:branding bugster:6753114
>  Patch15:     gnome-session-15-reenable-session.diff
> +#owner:gheet date:2009-04-30 type:branding doo:8554
> +Patch16:     gnome-session-16-null-prop-name.diff
>  
>  URL:          http://www.gnome.org
>  BuildRoot:    %{_tmppath}/%{name}-%{version}-build
> @@ -110,6 +112,7 @@
>  %patch13 -p1
>  %patch14 -p1
>  %patch15 -p1
> +%patch16 -p1
>  
>  %build
>  %ifos linux
> @@ -183,6 +186,8 @@
>  %{_libdir}/compiz-by-default
>  
>  %changelog
> +* Thu Apr 30 2009 - ghee.teo at sun.com
> +- added  patches/gnome-session-16-null-prop-name.diff for doo#8554.
>  * Wed Apr 22 2009 - matt.keenan at sun.com
>  - Bump compiz-session-integration tarball to 6.5 because of #7772
>  * Wed Apr 15 2009 - dave.lin at sun.com
> 


Reply via email to