Mercurial Mercurial > upstream > oracle > spec-files / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/gnome-session-16-null-prop-name.diff
author rohinis
Tue, 29 Nov 2011 17:32:55 +0000
branchs11express-2010-11
changeset 22234 c23e64da3e06
parent 15697 f729aa670a3d
permissions -rw-r--r--
2011-11-29 Rohini S <[email protected]> * patches/Python26-22-audio.diff: Fixes CVE-2010-1634 * specs/SUNWPython26.spec: Fixes CR 7085446
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
15697
f729aa670a3d 2009-04-30 Ghee Teo <[email protected]>
gheet
parents:
diff changeset 
     1
 
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
f729aa670a3d 2009-04-30 Ghee Teo <[email protected]>
gheet
parents:
diff changeset 
     2
 
--- gnome-session-2.26.1/gnome-session/gsm-xsmp-client.c	2009-04-30 16:31:31.198605588 +0100
f729aa670a3d 2009-04-30 Ghee Teo <[email protected]>
gheet
parents:
diff changeset 
     3
 
+++ ../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
f729aa670a3d 2009-04-30 Ghee Teo <[email protected]>
gheet
parents:
diff changeset 
     4
 
@@ -784,6 +784,9 @@
f729aa670a3d 2009-04-30 Ghee Teo <[email protected]>
gheet
parents:
diff changeset 
     5
 
         char   *name;
f729aa670a3d 2009-04-30 Ghee Teo <[email protected]>
gheet
parents:
diff changeset 
     6
f729aa670a3d 2009-04-30 Ghee Teo <[email protected]>
gheet
parents:
diff changeset 
     7
 
         prop = find_property (GSM_XSMP_CLIENT (client), SmProgram, NULL);
f729aa670a3d 2009-04-30 Ghee Teo <[email protected]>
gheet
parents:
diff changeset 
     8
 
+        if (!prop)
f729aa670a3d 2009-04-30 Ghee Teo <[email protected]>
gheet
parents:
diff changeset 
     9
 
+                return NULL;
f729aa670a3d 2009-04-30 Ghee Teo <[email protected]>
gheet
parents:
diff changeset 
    10
 
+
f729aa670a3d 2009-04-30 Ghee Teo <[email protected]>
gheet
parents:
diff changeset 
    11
 
         name = prop_to_command (prop);
f729aa670a3d 2009-04-30 Ghee Teo <[email protected]>
gheet
parents:
diff changeset 
    12
f729aa670a3d 2009-04-30 Ghee Teo <[email protected]>
gheet
parents:
diff changeset 
    13
 
         return name;
upstream/oracle/spec-files