[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108140: Fixes: debbugs:12444
From: |
Andreas Schwab |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108140: Fixes: debbugs:12444 |
Date: |
Fri, 14 Sep 2012 18:35:25 +0200 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 108140
committer: Andreas Schwab <address@hidden>
branch nick: emacs
timestamp: Fri 2012-09-14 18:35:25 +0200
message:
Fixes: debbugs:12444
* fileio.c (Ffile_selinux_context): Only call freecon when
lgetfilecon succeeded.
(Fset_file_selinux_context): Likewise.
modified:
src/ChangeLog
src/fileio.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2012-09-12 17:18:33 +0000
+++ b/src/ChangeLog 2012-09-14 16:35:25 +0000
@@ -1,3 +1,9 @@
+2012-09-14 Andreas Schwab <address@hidden>
+
+ * fileio.c (Ffile_selinux_context): Only call freecon when
+ lgetfilecon succeeded.
+ (Fset_file_selinux_context): Likewise. (Bug#12444)
+
2012-09-12 Eli Zaretskii <address@hidden>
* xdisp.c (try_window_reusing_current_matrix): Under bidi
=== modified file 'src/fileio.c'
--- a/src/fileio.c 2012-07-14 10:46:56 +0000
+++ b/src/fileio.c 2012-09-14 16:35:25 +0000
@@ -2841,9 +2841,8 @@
if (context_range_get (context))
values[3] = build_string (context_range_get (context));
context_free (context);
+ freecon (con);
}
- if (con)
- freecon (con);
}
#endif
@@ -2920,12 +2919,10 @@
report_file_error ("Doing lsetfilecon", Fcons (absname, Qnil));
context_free (parsed_con);
+ freecon (con);
}
else
report_file_error ("Doing lgetfilecon", Fcons (absname, Qnil));
-
- if (con)
- freecon (con);
}
#endif
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/emacs-24 r108140: Fixes: debbugs:12444,
Andreas Schwab <=