[glib/glib-2-22] GUnixFDMessage: fix a small typo in an extra check



commit 40005647ed81d6bbc13fac581ce44505deb042ca
Author: Ryan Lortie <desrt desrt ca>
Date:   Tue Jan 5 18:49:23 2010 -0500

    GUnixFDMessage: fix a small typo in an extra check
    
    In the deserialise function, GUnixFDMessage was comparing 'level' to
    both SOL_SOCKET and SCM_RIGHTS.  It is correct to compare 'type' to
    SCM_RIGHTS.  The code passed tests only because:
    
    1) it's a "should always be OK" double-check
    
    2) SOL_SOCKET and SCM_RIGHTS, by chance, both have the value '1' on
       Linux systems.
    (cherry picked from commit baf20e09842a97c2d7925dff5ff9c6d35e36b27d)

 gio/gunixfdmessage.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/gio/gunixfdmessage.c b/gio/gunixfdmessage.c
index 03c2825..0cdc956 100644
--- a/gio/gunixfdmessage.c
+++ b/gio/gunixfdmessage.c
@@ -81,7 +81,7 @@ g_unix_fd_message_deserialize (int      level,
   GUnixFDMessage *message;
 
   if (level != SOL_SOCKET ||
-      level != SCM_RIGHTS)
+      type != SCM_RIGHTS)
     return NULL;
   
   if (size % 4 > 0)



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]