components/texinfo/patches/window.c.patch
author April Chin <april.chin@oracle.com>
Fri, 03 Oct 2014 08:19:15 -0700
branchs11u2-sru
changeset 3361 a4a50df947fd
parent 2825 cb999e84659c
permissions -rw-r--r--
PSARC/2013/269 Add Ruby 1.9.3 and EOF and Remove Ruby 1.8.7 19624365 create runtime/ruby package that includes any ruby version
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2825
cb999e84659c 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.
cb999e84659c 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
cb999e84659c 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
cb999e84659c 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 @@
cb999e84659c 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))
cb999e84659c 17629924 texinfo 4.13 - make 64bits build, enable ASLR, and remove SFW links
Bick Torrejon <bick.torrejon@oracle.com>
parents:
diff changeset
     6
     {
cb999e84659c 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;
cb999e84659c 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;
cb999e84659c 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;
cb999e84659c 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;
cb999e84659c 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);
cb999e84659c 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));
cb999e84659c 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;
cb999e84659c 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));
cb999e84659c 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;
cb999e84659c 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;
cb999e84659c 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;
cb999e84659c 17629924 texinfo 4.13 - make 64bits build, enable ASLR, and remove SFW links
Bick Torrejon <bick.torrejon@oracle.com>
parents:
diff changeset
    18
 
cb999e84659c 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 @@
cb999e84659c 17629924 texinfo 4.13 - make 64bits build, enable ASLR, and remove SFW links
Bick Torrejon <bick.torrejon@oracle.com>
parents:
diff changeset
    20
  */
cb999e84659c 17629924 texinfo 4.13 - make 64bits build, enable ASLR, and remove SFW links
Bick Torrejon <bick.torrejon@oracle.com>
parents:
diff changeset
    21
 int
cb999e84659c 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,
cb999e84659c 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),
cb999e84659c 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),
cb999e84659c 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)
cb999e84659c 17629924 texinfo 4.13 - make 64bits build, enable ASLR, and remove SFW links
Bick Torrejon <bick.torrejon@oracle.com>
parents:
diff changeset
    26
 {
cb999e84659c 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;
cb999e84659c 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 @@
cb999e84659c 17629924 texinfo 4.13 - make 64bits build, enable ASLR, and remove SFW links
Bick Torrejon <bick.torrejon@oracle.com>
parents:
diff changeset
    29
     {
cb999e84659c 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);
cb999e84659c 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));
cb999e84659c 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;
cb999e84659c 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;
cb999e84659c 17629924 texinfo 4.13 - make 64bits build, enable ASLR, and remove SFW links
Bick Torrejon <bick.torrejon@oracle.com>
parents:
diff changeset
    34
 
cb999e84659c 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)
cb999e84659c 17629924 texinfo 4.13 - make 64bits build, enable ASLR, and remove SFW links
Bick Torrejon <bick.torrejon@oracle.com>
parents:
diff changeset
    36
 	break;