components/texinfo/patches/window.c.patch
author Rich Burridge <rich.burridge@oracle.com>
Mon, 02 Mar 2015 12:23:58 -0800
changeset 3880 408b5915875e
parent 1522 b74fd0949e89
permissions -rw-r--r--
20555148 conflict should be updated to version 20140723
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1522
b74fd0949e89 17629924 texinfo 4.13 - make 64bits build, enable ASLR, and remove SFW links
Bick Torrejon <bick.torrejon@oracle.com>
parents:
diff changeset
     1
texinfo-4.13 info command gives Bus Error. There has been reported bug in texinfo 4.13a in info/window.c.
b74fd0949e89 17629924 texinfo 4.13 - make 64bits build, enable ASLR, and remove SFW links
Bick Torrejon <bick.torrejon@oracle.com>
parents:
diff changeset
     2
--- texinfo-4.13/info/window.c.orig	2013-10-09 17:07:32.875146313 -0700
b74fd0949e89 17629924 texinfo 4.13 - make 64bits build, enable ASLR, and remove SFW links
Bick Torrejon <bick.torrejon@oracle.com>
parents:
diff changeset
     3
+++ texinfo-4.13/info/window.c	2013-10-09 17:35:44.959317979 -0700
b74fd0949e89 17629924 texinfo 4.13 - make 64bits build, enable ASLR, and remove SFW links
Bick Torrejon <bick.torrejon@oracle.com>
parents:
diff changeset
     4
@@ -1579,10 +1579,11 @@
b74fd0949e89 17629924 texinfo 4.13 - make 64bits build, enable ASLR, and remove SFW links
Bick Torrejon <bick.torrejon@oracle.com>
parents:
diff changeset
     5
        mbi_advance (iter))
b74fd0949e89 17629924 texinfo 4.13 - make 64bits build, enable ASLR, and remove SFW links
Bick Torrejon <bick.torrejon@oracle.com>
parents:
diff changeset
     6
     {
b74fd0949e89 17629924 texinfo 4.13 - make 64bits build, enable ASLR, and remove SFW links
Bick Torrejon <bick.torrejon@oracle.com>
parents:
diff changeset
     7
       const char *carried_over_ptr;
b74fd0949e89 17629924 texinfo 4.13 - make 64bits build, enable ASLR, and remove SFW links
Bick Torrejon <bick.torrejon@oracle.com>
parents:
diff changeset
     8
-      size_t carried_over_len, carried_over_count;
b74fd0949e89 17629924 texinfo 4.13 - make 64bits build, enable ASLR, and remove SFW links
Bick Torrejon <bick.torrejon@oracle.com>
parents:
diff changeset
     9
+      size_t carried_over_len = 0;
b74fd0949e89 17629924 texinfo 4.13 - make 64bits build, enable ASLR, and remove SFW links
Bick Torrejon <bick.torrejon@oracle.com>
parents:
diff changeset
    10
+      size_t carried_over_count = 0;
b74fd0949e89 17629924 texinfo 4.13 - make 64bits build, enable ASLR, and remove SFW links
Bick Torrejon <bick.torrejon@oracle.com>
parents:
diff changeset
    11
       const char *cur_ptr = mbi_cur_ptr (iter);
b74fd0949e89 17629924 texinfo 4.13 - make 64bits build, enable ASLR, and remove SFW links
Bick Torrejon <bick.torrejon@oracle.com>
parents:
diff changeset
    12
-      int cur_len = mb_len (mbi_cur (iter));
b74fd0949e89 17629924 texinfo 4.13 - make 64bits build, enable ASLR, and remove SFW links
Bick Torrejon <bick.torrejon@oracle.com>
parents:
diff changeset
    13
-      int replen;
b74fd0949e89 17629924 texinfo 4.13 - make 64bits build, enable ASLR, and remove SFW links
Bick Torrejon <bick.torrejon@oracle.com>
parents:
diff changeset
    14
+      size_t cur_len = mb_len (mbi_cur (iter));
b74fd0949e89 17629924 texinfo 4.13 - make 64bits build, enable ASLR, and remove SFW links
Bick Torrejon <bick.torrejon@oracle.com>
parents:
diff changeset
    15
+      size_t replen = 0;
b74fd0949e89 17629924 texinfo 4.13 - make 64bits build, enable ASLR, and remove SFW links
Bick Torrejon <bick.torrejon@oracle.com>
parents:
diff changeset
    16
       int delim = 0;
b74fd0949e89 17629924 texinfo 4.13 - make 64bits build, enable ASLR, and remove SFW links
Bick Torrejon <bick.torrejon@oracle.com>
parents:
diff changeset
    17
       int rc;
b74fd0949e89 17629924 texinfo 4.13 - make 64bits build, enable ASLR, and remove SFW links
Bick Torrejon <bick.torrejon@oracle.com>
parents:
diff changeset
    18
 
b74fd0949e89 17629924 texinfo 4.13 - make 64bits build, enable ASLR, and remove SFW links
Bick Torrejon <bick.torrejon@oracle.com>
parents:
diff changeset
    19
@@ -1831,7 +1832,7 @@
b74fd0949e89 17629924 texinfo 4.13 - make 64bits build, enable ASLR, and remove SFW links
Bick Torrejon <bick.torrejon@oracle.com>
parents:
diff changeset
    20
  */
b74fd0949e89 17629924 texinfo 4.13 - make 64bits build, enable ASLR, and remove SFW links
Bick Torrejon <bick.torrejon@oracle.com>
parents:
diff changeset
    21
 int
b74fd0949e89 17629924 texinfo 4.13 - make 64bits build, enable ASLR, and remove SFW links
Bick Torrejon <bick.torrejon@oracle.com>
parents:
diff changeset
    22
 window_scan_line (WINDOW *win, int line, int phys,
b74fd0949e89 17629924 texinfo 4.13 - make 64bits build, enable ASLR, and remove SFW links
Bick Torrejon <bick.torrejon@oracle.com>
parents:
diff changeset
    23
-		  void (*fun) (void *closure, long cpos, int replen),
b74fd0949e89 17629924 texinfo 4.13 - make 64bits build, enable ASLR, and remove SFW links
Bick Torrejon <bick.torrejon@oracle.com>
parents:
diff changeset
    24
+		  void (*fun) (void *closure, long cpos, size_t replen),
b74fd0949e89 17629924 texinfo 4.13 - make 64bits build, enable ASLR, and remove SFW links
Bick Torrejon <bick.torrejon@oracle.com>
parents:
diff changeset
    25
 		  void *closure)
b74fd0949e89 17629924 texinfo 4.13 - make 64bits build, enable ASLR, and remove SFW links
Bick Torrejon <bick.torrejon@oracle.com>
parents:
diff changeset
    26
 {
b74fd0949e89 17629924 texinfo 4.13 - make 64bits build, enable ASLR, and remove SFW links
Bick Torrejon <bick.torrejon@oracle.com>
parents:
diff changeset
    27
   mbi_iterator_t iter;
b74fd0949e89 17629924 texinfo 4.13 - make 64bits build, enable ASLR, and remove SFW links
Bick Torrejon <bick.torrejon@oracle.com>
parents:
diff changeset
    28
@@ -1853,7 +1854,7 @@
b74fd0949e89 17629924 texinfo 4.13 - make 64bits build, enable ASLR, and remove SFW links
Bick Torrejon <bick.torrejon@oracle.com>
parents:
diff changeset
    29
     {
b74fd0949e89 17629924 texinfo 4.13 - make 64bits build, enable ASLR, and remove SFW links
Bick Torrejon <bick.torrejon@oracle.com>
parents:
diff changeset
    30
       const char *cur_ptr = mbi_cur_ptr (iter);
b74fd0949e89 17629924 texinfo 4.13 - make 64bits build, enable ASLR, and remove SFW links
Bick Torrejon <bick.torrejon@oracle.com>
parents:
diff changeset
    31
       int cur_len = mb_len (mbi_cur (iter));
b74fd0949e89 17629924 texinfo 4.13 - make 64bits build, enable ASLR, and remove SFW links
Bick Torrejon <bick.torrejon@oracle.com>
parents:
diff changeset
    32
-      int replen;
b74fd0949e89 17629924 texinfo 4.13 - make 64bits build, enable ASLR, and remove SFW links
Bick Torrejon <bick.torrejon@oracle.com>
parents:
diff changeset
    33
+      size_t replen;
b74fd0949e89 17629924 texinfo 4.13 - make 64bits build, enable ASLR, and remove SFW links
Bick Torrejon <bick.torrejon@oracle.com>
parents:
diff changeset
    34
 
b74fd0949e89 17629924 texinfo 4.13 - make 64bits build, enable ASLR, and remove SFW links
Bick Torrejon <bick.torrejon@oracle.com>
parents:
diff changeset
    35
       if (cur_ptr >= endp)
b74fd0949e89 17629924 texinfo 4.13 - make 64bits build, enable ASLR, and remove SFW links
Bick Torrejon <bick.torrejon@oracle.com>
parents:
diff changeset
    36
 	break;