aboutsummaryrefslogtreecommitdiffstats
path: root/src/sysdep.c
diff options
context:
space:
mode:
authorNoam Postavsky2019-06-25 22:04:13 -0400
committerNoam Postavsky2019-06-25 22:04:13 -0400
commit9552ee4df7d2ceebb8728a61d00598aa981b580c (patch)
tree5bd393a52f3f1b0510ff77fb2bd38e4a2c00ad8c /src/sysdep.c
parentc7a59d87b5726725cffa51a1f432f0961548dbe3 (diff)
parente62ad04963982ea9cc7622b32484778845bc2ec1 (diff)
downloademacs-9552ee4df7d2ceebb8728a61d00598aa981b580c.tar.gz
emacs-9552ee4df7d2ceebb8728a61d00598aa981b580c.zip
Merge from emacs-26
e62ad04963 Fix sgml-mode handling of quotes within parens (Bug#36347) 06b35b2f92 ; * lisp/frame.el: Enhance add-variable-watcher commentary. 572e34bb6f Rename 'make-symbolic-link' argument NEWNAME to LINKNAME 04477adedc Check that length of data returned by sysctl is non-zero 81535eeadb * test/lisp/progmodes/python-tests.el (python-virt-bin): D... 9d48979ca8 Fix Python tests depending on system-type fcf6cc3177 Fix problem with wdired test when symlinks cannot be created. 4701e0663e Improve wording of documentation of click events # Conflicts: # lisp/textmodes/sgml-mode.el # test/lisp/textmodes/sgml-mode-tests.el
Diffstat (limited to 'src/sysdep.c')
-rw-r--r--src/sysdep.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/sysdep.c b/src/sysdep.c
index f7fc99f147f..4f89e8aba10 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -3018,11 +3018,11 @@ list_system_processes (void)
3018 3018
3019 Lisp_Object proclist = Qnil; 3019 Lisp_Object proclist = Qnil;
3020 3020
3021 if (sysctl (mib, 3, NULL, &len, NULL, 0) != 0) 3021 if (sysctl (mib, 3, NULL, &len, NULL, 0) != 0 || len == 0)
3022 return proclist; 3022 return proclist;
3023 3023
3024 procs = xmalloc (len); 3024 procs = xmalloc (len);
3025 if (sysctl (mib, 3, procs, &len, NULL, 0) != 0) 3025 if (sysctl (mib, 3, procs, &len, NULL, 0) != 0 || len == 0)
3026 { 3026 {
3027 xfree (procs); 3027 xfree (procs);
3028 return proclist; 3028 return proclist;
@@ -3616,7 +3616,7 @@ system_process_attributes (Lisp_Object pid)
3616 CONS_TO_INTEGER (pid, int, proc_id); 3616 CONS_TO_INTEGER (pid, int, proc_id);
3617 mib[3] = proc_id; 3617 mib[3] = proc_id;
3618 3618
3619 if (sysctl (mib, 4, &proc, &proclen, NULL, 0) != 0) 3619 if (sysctl (mib, 4, &proc, &proclen, NULL, 0) != 0 || proclen == 0)
3620 return attrs; 3620 return attrs;
3621 3621
3622 attrs = Fcons (Fcons (Qeuid, INT_TO_INTEGER (proc.ki_uid)), attrs); 3622 attrs = Fcons (Fcons (Qeuid, INT_TO_INTEGER (proc.ki_uid)), attrs);
@@ -3739,7 +3739,7 @@ system_process_attributes (Lisp_Object pid)
3739 3739
3740 mib[2] = KERN_PROC_ARGS; 3740 mib[2] = KERN_PROC_ARGS;
3741 len = MAXPATHLEN; 3741 len = MAXPATHLEN;
3742 if (sysctl (mib, 4, args, &len, NULL, 0) == 0) 3742 if (sysctl (mib, 4, args, &len, NULL, 0) == 0 && len != 0)
3743 { 3743 {
3744 int i; 3744 int i;
3745 for (i = 0; i < len; i++) 3745 for (i = 0; i < len; i++)
@@ -3785,7 +3785,7 @@ system_process_attributes (Lisp_Object pid)
3785 CONS_TO_INTEGER (pid, int, proc_id); 3785 CONS_TO_INTEGER (pid, int, proc_id);
3786 mib[3] = proc_id; 3786 mib[3] = proc_id;
3787 3787
3788 if (sysctl (mib, 4, &proc, &proclen, NULL, 0) != 0) 3788 if (sysctl (mib, 4, &proc, &proclen, NULL, 0) != 0 || proclen == 0)
3789 return attrs; 3789 return attrs;
3790 3790
3791 uid = proc.kp_eproc.e_ucred.cr_uid; 3791 uid = proc.kp_eproc.e_ucred.cr_uid;