/[pcre]/code/branches/pcre16/pcre_exec.c
ViewVC logotype

Diff of /code/branches/pcre16/pcre_exec.c

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

revision 820 by zherczeg, Mon Dec 19 11:04:45 2011 UTC revision 821 by ph10, Fri Dec 23 16:38:13 2011 UTC
# Line 6635  for(;;) Line 6635  for(;;)
6635    
6636    /* If we have just passed a CR and we are now at a LF, and the pattern does    /* If we have just passed a CR and we are now at a LF, and the pattern does
6637    not contain any explicit matches for \r or \n, and the newline option is CRLF    not contain any explicit matches for \r or \n, and the newline option is CRLF
6638    or ANY or ANYCRLF, advance the match position by one more character. */    or ANY or ANYCRLF, advance the match position by one more character. In
6639      normal matching start_match will aways be greater than the first position at
6640      this stage, but a failed *SKIP can cause a return at the same point, which is
6641      why the first test exists. */
6642    
6643    if (start_match[-1] == CHAR_CR &&    if (start_match > (PCRE_PUCHAR)subject + start_offset &&
6644          start_match[-1] == CHAR_CR &&
6645        start_match < end_subject &&        start_match < end_subject &&
6646        *start_match == CHAR_NL &&        *start_match == CHAR_NL &&
6647        (re->flags & PCRE_HASCRORLF) == 0 &&        (re->flags & PCRE_HASCRORLF) == 0 &&

Legend:
Removed from v.820  
changed lines
  Added in v.821

  ViewVC Help
Powered by ViewVC 1.1.5