* src/fileio.c (Ffile_selinux_context): Context functions may return null.

diff --git a/src/ChangeLog b/src/ChangeLog
index e543fe7655fdc2314c0a6d01a2996865291a5ffc..3f6a45a411891efe5426ded837d608498abd8691 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-01  Karel Klíč  <kklic@redhat.com>
+
+       * fileio.c (Ffile_selinux_context): Context functions may return null.
+
 2010-04-30  Dan Nicolaescu  <dann@ics.uci.edu>
 
        * s/gnu.h (POSIX_SIGNALS):

diff --git a/src/fileio.c b/src/fileio.c
index 4bfbae918448735675fdfc056b478072dce23e72..13825a5421201b3592307955b2eeee77a481521a 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -2918,10 +2918,14 @@ if file does not exist, is not accessible, or SELinux is disabled */)
       if (conlength > 0)
        {
          context = context_new (con);
-         values[0] = build_string (context_user_get (context));
-         values[1] = build_string (context_role_get (context));
-         values[2] = build_string (context_type_get (context));
-         values[3] = build_string (context_range_get (context));
+         if (context_user_get (context))
+           values[0] = build_string (context_user_get (context));
+         if (context_role_get (context))
+           values[1] = build_string (context_role_get (context));
+         if (context_type_get (context))
+           values[2] = build_string (context_type_get (context));
+         if (context_range_get (context))
+           values[3] = build_string (context_range_get (context));
          context_free (context);
        }
       if (con)