| Revision | 4ec4c53046b5be6700810b9b92996a0cfb4ed52a (tree) |
|---|---|
| Zeit | 2006-06-21 03:49:32 |
| Autor | vimboss |
| Commiter | vimboss |
updated for version 7.0-021
src/quickfix.c (diff) src/version.c (diff)| @@ -602,13 +602,19 @@ | ||
| 602 | 602 | else |
| 603 | 603 | type = 0; |
| 604 | 604 | /* |
| 605 | - * Extract error message data from matched line | |
| 605 | + * Extract error message data from matched line. | |
| 606 | + * We check for an actual submatch, because "\[" and "\]" in | |
| 607 | + * the 'errorformat' may cause the wrong submatch to be used. | |
| 606 | 608 | */ |
| 607 | 609 | if ((i = (int)fmt_ptr->addr[0]) > 0) /* %f */ |
| 608 | 610 | { |
| 609 | - int c = *regmatch.endp[i]; | |
| 611 | + int c; | |
| 612 | + | |
| 613 | + if (regmatch.startp[i] == NULL || regmatch.endp[i] == NULL) | |
| 614 | + continue; | |
| 610 | 615 | |
| 611 | 616 | /* Expand ~/file and $HOME/file to full path. */ |
| 617 | + c = *regmatch.endp[i]; | |
| 612 | 618 | *regmatch.endp[i] = NUL; |
| 613 | 619 | expand_env(regmatch.startp[i], namebuf, CMDBUFFSIZE); |
| 614 | 620 | *regmatch.endp[i] = c; |
| @@ -618,35 +624,63 @@ | ||
| 618 | 624 | continue; |
| 619 | 625 | } |
| 620 | 626 | if ((i = (int)fmt_ptr->addr[1]) > 0) /* %n */ |
| 627 | + { | |
| 628 | + if (regmatch.startp[i] == NULL) | |
| 629 | + continue; | |
| 621 | 630 | enr = (int)atol((char *)regmatch.startp[i]); |
| 631 | + } | |
| 622 | 632 | if ((i = (int)fmt_ptr->addr[2]) > 0) /* %l */ |
| 633 | + { | |
| 634 | + if (regmatch.startp[i] == NULL) | |
| 635 | + continue; | |
| 623 | 636 | lnum = atol((char *)regmatch.startp[i]); |
| 637 | + } | |
| 624 | 638 | if ((i = (int)fmt_ptr->addr[3]) > 0) /* %c */ |
| 639 | + { | |
| 640 | + if (regmatch.startp[i] == NULL) | |
| 641 | + continue; | |
| 625 | 642 | col = (int)atol((char *)regmatch.startp[i]); |
| 643 | + } | |
| 626 | 644 | if ((i = (int)fmt_ptr->addr[4]) > 0) /* %t */ |
| 645 | + { | |
| 646 | + if (regmatch.startp[i] == NULL) | |
| 647 | + continue; | |
| 627 | 648 | type = *regmatch.startp[i]; |
| 649 | + } | |
| 628 | 650 | if (fmt_ptr->flags == '+' && !multiscan) /* %+ */ |
| 629 | 651 | STRCPY(errmsg, IObuff); |
| 630 | 652 | else if ((i = (int)fmt_ptr->addr[5]) > 0) /* %m */ |
| 631 | 653 | { |
| 654 | + if (regmatch.startp[i] == NULL || regmatch.endp[i] == NULL) | |
| 655 | + continue; | |
| 632 | 656 | len = (int)(regmatch.endp[i] - regmatch.startp[i]); |
| 633 | 657 | vim_strncpy(errmsg, regmatch.startp[i], len); |
| 634 | 658 | } |
| 635 | 659 | if ((i = (int)fmt_ptr->addr[6]) > 0) /* %r */ |
| 660 | + { | |
| 661 | + if (regmatch.startp[i] == NULL) | |
| 662 | + continue; | |
| 636 | 663 | tail = regmatch.startp[i]; |
| 664 | + } | |
| 637 | 665 | if ((i = (int)fmt_ptr->addr[7]) > 0) /* %p */ |
| 638 | 666 | { |
| 667 | + if (regmatch.startp[i] == NULL || regmatch.endp[i] == NULL) | |
| 668 | + continue; | |
| 639 | 669 | col = (int)(regmatch.endp[i] - regmatch.startp[i] + 1); |
| 640 | 670 | if (*((char_u *)regmatch.startp[i]) != TAB) |
| 641 | 671 | use_viscol = TRUE; |
| 642 | 672 | } |
| 643 | 673 | if ((i = (int)fmt_ptr->addr[8]) > 0) /* %v */ |
| 644 | 674 | { |
| 675 | + if (regmatch.startp[i] == NULL) | |
| 676 | + continue; | |
| 645 | 677 | col = (int)atol((char *)regmatch.startp[i]); |
| 646 | 678 | use_viscol = TRUE; |
| 647 | 679 | } |
| 648 | 680 | if ((i = (int)fmt_ptr->addr[9]) > 0) /* %s */ |
| 649 | 681 | { |
| 682 | + if (regmatch.startp[i] == NULL || regmatch.endp[i] == NULL) | |
| 683 | + continue; | |
| 650 | 684 | len = (int)(regmatch.endp[i] - regmatch.startp[i]); |
| 651 | 685 | if (len > CMDBUFFSIZE - 5) |
| 652 | 686 | len = CMDBUFFSIZE - 5; |
| @@ -667,6 +667,8 @@ | ||
| 667 | 667 | static int included_patches[] = |
| 668 | 668 | { /* Add new patch number below this line */ |
| 669 | 669 | /**/ |
| 670 | + 21, | |
| 671 | +/**/ | |
| 670 | 672 | 20, |
| 671 | 673 | /**/ |
| 672 | 674 | 19, |
Vim
Fork