[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] feature/gnus-select 036f0fe 032/218: Fix string-to-number
From: |
Andrew G Cohen |
Subject: |
[Emacs-diffs] feature/gnus-select 036f0fe 032/218: Fix string-to-number C-level mishandling |
Date: |
Fri, 14 Dec 2018 03:34:50 -0500 (EST) |
branch: feature/gnus-select
commit 036f0fe8429558aa2971091c5e4382c1eed1d66e
Author: Paul Eggert <address@hidden>
Commit: Andrew G Cohen <address@hidden>
Fix string-to-number C-level mishandling
* src/sysdep.c (list_system_processes):
* src/xfaces.c (Finternal_set_lisp_face_attribute_from_resource):
Defend against Fstring_to_number returning a float or a nonsense
integer.
---
src/sysdep.c | 6 +++++-
src/xfaces.c | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/sysdep.c b/src/sysdep.c
index c59034c..1eaf648 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -3006,7 +3006,11 @@ list_system_processes (void)
for (tail = proclist; CONSP (tail); tail = next)
{
next = XCDR (tail);
- XSETCAR (tail, Fstring_to_number (XCAR (tail), Qnil));
+ Lisp_Object pidstring = XCAR (tail);
+ Lisp_Object pid = Fstring_to_number (pidstring, Qnil);
+ if (!INTEGERP (pid) || XINT (pid) <= 0)
+ xsignal1 (Qoverflow_error, pidstring);
+ XSETCAR (tail, pid);
}
/* directory_files_internal returns the files in reverse order; undo
diff --git a/src/xfaces.c b/src/xfaces.c
index 77afee4..56df065 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -3393,7 +3393,7 @@ DEFUN ("internal-set-lisp-face-attribute-from-resource",
else if (EQ (attr, QCheight))
{
value = Fstring_to_number (value, make_number (10));
- if (XINT (value) <= 0)
+ if (!INTEGERP (value) || XINT (value) <= 0)
signal_error ("Invalid face height from X resource", value);
}
else if (EQ (attr, QCbold) || EQ (attr, QCitalic))
- [Emacs-diffs] feature/gnus-select 7ec13d7 011/218: Minor copyedits in display.texi, (continued)
- [Emacs-diffs] feature/gnus-select 7ec13d7 011/218: Minor copyedits in display.texi, Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select 30510cf 026/218: Update from Gnulib, Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select c69a17d 025/218: * lisp/isearch.el (search-exit-option): Add option 'append'., Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select 781d997 008/218: Replace some obsolete aliases in code, Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select 317b4d2 010/218: Fix display of TABs in hscrolled windows with line numbers, Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select de2b09f 024/218: Add to "Completion Commands" Info node, Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select 4efd277 030/218: ; * lisp/org/org-table.el: Replace obsolete alias in comment., Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select 52b1442 003/218: Revert last commit, Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select 1d6e562 021/218: More minor changes in the manual, Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select 954d7ce 035/218: * test/Makefile.in (check-declare): New PHONY rule., Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select 036f0fe 032/218: Fix string-to-number C-level mishandling,
Andrew G Cohen <=
- [Emacs-diffs] feature/gnus-select 0160cc5 029/218: Avoid losing info when formatting integers, Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select 5276bca 052/218: Make transpose-regions interactive (Bug#30343), Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select 5400223 062/218: * lisp/vc/vc-dir.el (vc-dir-unmark): Fix documentation., Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select 71da4a5 063/218: ; * lisp/minibuffer.el (completion-cycle-threshold): Fix last change., Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select fbe22b5 014/218: Replace some obsolete aliases in code, Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select 46738e3 040/218: Improve SVG documentation, Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select d25b161 042/218: Fix wrong behavior of 'outline-headers-as-kill' command (Bug#30209), Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select 064037f 050/218: * lisp/simple.el (mark-whole-buffer): Clarify its behavior., Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select 906b8fb 048/218: Port to NetBSD tzalloc, Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select fd1f96f 060/218: Replace use of the obsolete write-contents-hooks, Andrew G Cohen, 2018/12/14