[Emacs-diffs] /srv/bzr/emacs/trunk r100101: * src/fileio.c (Ffile_selinux_context): Context functions may return null.

[Glenn Morris]

------------------------------------------------------------
revno: 100101
author: Karel Klic <address@hidden>
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2010-04-30 19:58:41 -0700
message:
  * src/fileio.c (Ffile_selinux_context): Context functions may return null.
modified:
  src/ChangeLog
  src/fileio.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-04-30 20:48:04 +0000
+++ b/src/ChangeLog     2010-05-01 02:58:41 +0000
@@ -1,3 +1,7 @@
+2010-05-01  Karel Klíč  <address@hidden>
+
+       * fileio.c (Ffile_selinux_context): Context functions may return null.
+
 2010-04-30  Dan Nicolaescu  <address@hidden>
 
        * s/gnu.h (POSIX_SIGNALS):

=== modified file 'src/fileio.c'
--- a/src/fileio.c      2010-04-21 03:02:58 +0000
+++ b/src/fileio.c      2010-05-01 02:58:41 +0000
@@ -2918,10 +2918,14 @@
       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)