[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r117889: Avoid more integer overflows on string size
From: |
Dmitry Antipov |
Subject: |
[Emacs-diffs] trunk r117889: Avoid more integer overflows on string size calculations. |
Date: |
Tue, 16 Sep 2014 11:44:08 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117889
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Tue 2014-09-16 15:43:49 +0400
message:
Avoid more integer overflows on string size calculations.
* category.c (Fmake_category_set):
* xdisp.c (get_overlay_arrow_glyph_row):
* w32font.c (intern_font_name): Prefer ptrdiff_t to int.
modified:
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/category.c category.c-20091113204419-o5vbwnq5f7feedwu-1071
src/w32font.c w32font.c-20091113204419-o5vbwnq5f7feedwu-8545
src/xdisp.c xdisp.c-20091113204419-o5vbwnq5f7feedwu-240
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2014-09-16 08:20:08 +0000
+++ b/src/ChangeLog 2014-09-16 11:43:49 +0000
@@ -16,6 +16,11 @@
(x_clipboard_manager_save_all):
* xterm.c (x_term_init): Use build_local_string.
+ Avoid more integer overflows on string size calculations.
+ * category.c (Fmake_category_set):
+ * xdisp.c (get_overlay_arrow_glyph_row):
+ * w32font.c (intern_font_name): Prefer ptrdiff_t to int.
+
2014-09-15 Eli Zaretskii <address@hidden>
* sound.c [WINDOWSNT]: Include w32common.h and mbstring.h.
=== modified file 'src/category.c'
--- a/src/category.c 2014-01-01 07:43:34 +0000
+++ b/src/category.c 2014-09-16 11:43:49 +0000
@@ -96,7 +96,7 @@
(Lisp_Object categories)
{
Lisp_Object val;
- int len;
+ ptrdiff_t len;
CHECK_STRING (categories);
val = MAKE_CATEGORY_SET;
=== modified file 'src/w32font.c'
--- a/src/w32font.c 2014-08-25 07:00:42 +0000
+++ b/src/w32font.c 2014-09-16 11:43:49 +0000
@@ -287,7 +287,7 @@
intern_font_name (char * string)
{
Lisp_Object str = DECODE_SYSTEM (build_string (string));
- int len = SCHARS (str);
+ ptrdiff_t len = SCHARS (str);
Lisp_Object obarray = check_obarray (Vobarray);
Lisp_Object tem = oblookup (obarray, SDATA (str), len, len);
/* This code is similar to intern function from lread.c. */
=== modified file 'src/xdisp.c'
--- a/src/xdisp.c 2014-09-16 08:20:08 +0000
+++ b/src/xdisp.c 2014-09-16 11:43:49 +0000
@@ -18858,7 +18858,7 @@
struct buffer *buffer = XBUFFER (w->contents);
struct buffer *old = current_buffer;
const unsigned char *arrow_string = SDATA (overlay_arrow_string);
- int arrow_len = SCHARS (overlay_arrow_string);
+ ptrdiff_t arrow_len = SCHARS (overlay_arrow_string);
const unsigned char *arrow_end = arrow_string + arrow_len;
const unsigned char *p;
struct it it;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r117889: Avoid more integer overflows on string size calculations.,
Dmitry Antipov <=