/[pcre]/code/trunk/pcretest.c
ViewVC logotype

Diff of /code/trunk/pcretest.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 351 by ph10, Fri Jul 4 18:27:16 2008 UTC revision 363 by ph10, Thu Jul 10 16:24:33 2008 UTC
# Line 1806  while (!done) Line 1806  while (!done)
1806              {              {
1807              unsigned char buff8[8];              unsigned char buff8[8];
1808              int ii, utn;              int ii, utn;
1809              utn = ord2utf8(c, buff8);              if (use_utf8)
1810              for (ii = 0; ii < utn - 1; ii++) *q++ = buff8[ii];                {
1811              c = buff8[ii];   /* Last byte */                utn = ord2utf8(c, buff8);
1812                  for (ii = 0; ii < utn - 1; ii++) *q++ = buff8[ii];
1813                  c = buff8[ii];   /* Last byte */
1814                  }
1815                else
1816                 {
1817                 if (c > 255)
1818                   fprintf(outfile, "** Character \\x{%x} is greater than 255 and "
1819                     "UTF-8 mode is not enabled.\n"
1820                     "** Truncation will probably give the wrong result.\n", c);
1821                 }
1822              p = pt + 1;              p = pt + 1;
1823              break;              break;
1824              }              }
# Line 2017  while (!done) Line 2027  while (!done)
2027        }        }
2028      *q = 0;      *q = 0;
2029      len = q - dbuffer;      len = q - dbuffer;
2030    
2031        /* Move the data to the end of the buffer so that a read over the end of
2032        the buffer will be seen by valgrind, even if it doesn't cause a crash. If
2033        we are using the POSIX interface, we must include the terminating zero. */
2034    
2035    #if !defined NOPOSIX
2036        if (posix || do_posix)
2037          {
2038          memmove(bptr + buffer_size - len - 1, bptr, len + 1);
2039          bptr += buffer_size - len - 1;
2040          }
2041        else
2042    #endif
2043          {
2044          memmove(bptr + buffer_size - len, bptr, len);
2045          bptr += buffer_size - len;
2046          }
2047    
2048      if ((all_use_dfa || use_dfa) && find_match_limit)      if ((all_use_dfa || use_dfa) && find_match_limit)
2049        {        {

Legend:
Removed from v.351  
changed lines
  Added in v.363

  ViewVC Help
Powered by ViewVC 1.1.5