Mercurial > vim
comparison src/regexp.c @ 4746:d1376091d18b v7.3.1120
updated for version 7.3.1120
Problem: Crash when regexp logging is enabled.
Solution: Avoid using NULL pointers. Advance over count argument.
author | Bram Moolenaar <bram@vim.org> |
---|---|
date | Wed, 05 Jun 2013 16:33:10 +0200 |
parents | a62695305e03 |
children | 532a9855bd30 |
comparison
equal
deleted
inserted
replaced
4745:1a320d3306c5 | 4746:d1376091d18b |
---|---|
6536 fprintf(f, "(%d)", (int)((s - r->program) + (next - s))); | 6536 fprintf(f, "(%d)", (int)((s - r->program) + (next - s))); |
6537 if (end < next) | 6537 if (end < next) |
6538 end = next; | 6538 end = next; |
6539 if (op == BRACE_LIMITS) | 6539 if (op == BRACE_LIMITS) |
6540 { | 6540 { |
6541 /* Two short ints */ | 6541 /* Two ints */ |
6542 fprintf(f, " minval %ld, maxval %ld", OPERAND_MIN(s), OPERAND_MAX(s)); | 6542 fprintf(f, " minval %ld, maxval %ld", OPERAND_MIN(s), OPERAND_MAX(s)); |
6543 s += 8; | 6543 s += 8; |
6544 } | |
6545 else if (op == BEHIND || op == NOBEHIND) | |
6546 { | |
6547 /* one int */ | |
6548 fprintf(f, " count %ld", OPERAND_MIN(s)); | |
6549 s += 4; | |
6544 } | 6550 } |
6545 s += 3; | 6551 s += 3; |
6546 if (op == ANYOF || op == ANYOF + ADD_NL | 6552 if (op == ANYOF || op == ANYOF + ADD_NL |
6547 || op == ANYBUT || op == ANYBUT + ADD_NL | 6553 || op == ANYBUT || op == ANYBUT + ADD_NL |
6548 || op == EXACTLY) | 6554 || op == EXACTLY) |