components/texinfo/patches/window.c.patch
changeset 1522 b74fd0949e89
equal deleted inserted replaced
1521:f6809e8c5110 1522:b74fd0949e89
       
     1 texinfo-4.13 info command gives Bus Error. There has been reported bug in texinfo 4.13a in info/window.c.
       
     2 --- texinfo-4.13/info/window.c.orig	2013-10-09 17:07:32.875146313 -0700
       
     3 +++ texinfo-4.13/info/window.c	2013-10-09 17:35:44.959317979 -0700
       
     4 @@ -1579,10 +1579,11 @@
       
     5         mbi_advance (iter))
       
     6      {
       
     7        const char *carried_over_ptr;
       
     8 -      size_t carried_over_len, carried_over_count;
       
     9 +      size_t carried_over_len = 0;
       
    10 +      size_t carried_over_count = 0;
       
    11        const char *cur_ptr = mbi_cur_ptr (iter);
       
    12 -      int cur_len = mb_len (mbi_cur (iter));
       
    13 -      int replen;
       
    14 +      size_t cur_len = mb_len (mbi_cur (iter));
       
    15 +      size_t replen = 0;
       
    16        int delim = 0;
       
    17        int rc;
       
    18  
       
    19 @@ -1831,7 +1832,7 @@
       
    20   */
       
    21  int
       
    22  window_scan_line (WINDOW *win, int line, int phys,
       
    23 -		  void (*fun) (void *closure, long cpos, int replen),
       
    24 +		  void (*fun) (void *closure, long cpos, size_t replen),
       
    25  		  void *closure)
       
    26  {
       
    27    mbi_iterator_t iter;
       
    28 @@ -1853,7 +1854,7 @@
       
    29      {
       
    30        const char *cur_ptr = mbi_cur_ptr (iter);
       
    31        int cur_len = mb_len (mbi_cur (iter));
       
    32 -      int replen;
       
    33 +      size_t replen;
       
    34  
       
    35        if (cur_ptr >= endp)
       
    36  	break;