When decoding, prefer ptrdiff_t to int for buffer positions etc.

* coding.c (detect_coding_utf_8, emacs_mule_char)
(detect_coding_iso_2022, encode_coding_iso_2022, check_ascii)
(check_utf_8, decode_coding):
* coding.h (struct coding_system.errors):
Use ptrdiff_t, not int, for integer values derived from buffer and
string positions.

diff --git a/src/ChangeLog b/src/ChangeLog
index e875bc8a40d27d19ddf5254dc67bd1dfab8b1e3d..96aee86932b16d885e9e25e7f218ff6639c74f46 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,13 @@
 2014-01-26  Paul Eggert  <eggert@cs.ucla.edu>
 
+       When decoding, prefer ptrdiff_t to int for buffer positions etc.
+       * coding.c (detect_coding_utf_8, emacs_mule_char)
+       (detect_coding_iso_2022, encode_coding_iso_2022, check_ascii)
+       (check_utf_8, decode_coding):
+       * coding.h (struct coding_system.errors):
+       Use ptrdiff_t, not int, for integer values derived from buffer and
+       string positions.
+
        Fix crash with insert-file-contents and misdecoded text (Bug#16286).
        * fileio.c (Finsert_file_contents): Set CODING_MODE_LAST_BLOCK
        before invoking decode_coding_gap, since there's just one block.

diff --git a/src/coding.c b/src/coding.c
index e4b9238599e196c5617ed048f2c8e15f803ddaad..01964eba4d3ec01ffb60ee033cd6a8d0da518eb2 100644 (file)
--- a/src/coding.c
+++ b/src/coding.c
@@ -1202,7 +1202,7 @@ detect_coding_utf_8 (struct coding_system *coding,
   bool multibytep = coding->src_multibyte;
   ptrdiff_t consumed_chars = 0;
   bool bom_found = 0;
-  int nchars = coding->head_ascii;
+  ptrdiff_t nchars = coding->head_ascii;
   int eol_seen = coding->eol_seen;
 
   detect_info->checked |= CATEGORY_MASK_UTF_8;
@@ -2013,7 +2013,7 @@ emacs_mule_char (struct coding_system *coding, const unsigned char *src,
   int charset_ID;
   unsigned code;
   int c;
-  int consumed_chars = 0;
+  ptrdiff_t consumed_chars = 0;
   bool mseq_found = 0;
 
   ONE_MORE_BYTE (c);
@@ -3190,7 +3190,7 @@ detect_coding_iso_2022 (struct coding_system *coding,
              if (! single_shifting
                  && ! (rejected & CATEGORY_MASK_ISO_8_2))
                {
-                 int len = 1;
+                 ptrdiff_t len = 1;
                  while (src < src_end)
                    {
                      src_base = src;
@@ -4456,7 +4456,7 @@ encode_coding_iso_2022 (struct coding_system *coding)
        {
          /* We have to produce designation sequences if any now.  */
          unsigned char desig_buf[16];
-         int nbytes;
+         ptrdiff_t nbytes;
          ptrdiff_t offset;
 
          charset_map_loaded = 0;
@@ -6211,7 +6211,7 @@ static Lisp_Object adjust_coding_eol_type (struct coding_system *coding,
    EOL_SEEN_LF, EOL_SEEN_CR, and EOL_SEEN_CRLF, but the value is
    reliable only when all the source bytes are ASCII.  */
 
-static int
+static ptrdiff_t
 check_ascii (struct coding_system *coding)
 {
   const unsigned char *src, *end;
@@ -6283,12 +6283,12 @@ check_ascii (struct coding_system *coding)
    the value is reliable only when all the source bytes are valid
    UTF-8.  */
 
-static int
+static ptrdiff_t
 check_utf_8 (struct coding_system *coding)
 {
   const unsigned char *src, *end;
   int eol_seen;
-  int nchars = coding->head_ascii;
+  ptrdiff_t nchars = coding->head_ascii;
 
   if (coding->head_ascii < 0)
     check_ascii (coding);
@@ -7414,7 +7414,7 @@ decode_coding (struct coding_system *coding)
   coding->carryover_bytes = 0;
   if (coding->consumed < coding->src_bytes)
     {
-      int nbytes = coding->src_bytes - coding->consumed;
+      ptrdiff_t nbytes = coding->src_bytes - coding->consumed;
       const unsigned char *src;
 
       coding_set_source (coding);

diff --git a/src/coding.h b/src/coding.h
index 7730109bcfd3c9b24e9774fec075f268aec6bed7..c9c19762d80d4509cd0cc5c52d71c74903de2ad7 100644 (file)
--- a/src/coding.h
+++ b/src/coding.h
@@ -477,7 +477,7 @@ struct coding_system
   ptrdiff_t produced, produced_char, consumed, consumed_char;
 
   /* Number of error source data found in a decoding routine.  */
-  int errors;
+  ptrdiff_t errors;
 
   /* Store the positions of error source data.  */
   ptrdiff_t *error_positions;