Refactor the qf_parse_line() function in quickfix.c #2881
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dpelle
reviewed
May 7, 2018
src/quickfix.c
Outdated
| if (linelen >= fields->errmsglen) | ||
| { | ||
| /* linelen + null terminator */ | ||
| if ((fields->errmsg = vim_realloc(fields->errmsg, |
Member
There was a problem hiding this comment.
This way of calling realloc leaks memory if realloc(…) fails i.e. if it returns NULL.
See https://www.viva64.com/en/w/v701/ for more details.
src/quickfix.c
Outdated
| if (len >= fields->errmsglen) | ||
| { | ||
| /* len + null terminator */ | ||
| if ((fields->errmsg = vim_realloc(fields->errmsg, len + 1)) |
Member
There was a problem hiding this comment.
Same remark: leak if vim_realloc(…) returns NULL.
src/quickfix.c
Outdated
| if (linelen >= fields->errmsglen) | ||
| { | ||
| /* linelen + null terminator */ | ||
| if ((fields->errmsg = vim_realloc(fields->errmsg, |
|
Hi,
On Mon, May 7, 2018 at 12:12 AM, Dominique Pellé ***@***.***> wrote:
@dpelle commented on this pull request.
________________________________
In src/quickfix.c:
> + if (regmatch->startp[i] == NULL)
+ return QF_FAIL;
+ fields->col = (int)atol((char *)regmatch->startp[i]);
+ }
+ if ((i = (int)fmt_ptr->addr[4]) > 0) /* %t */
+ {
+ if (regmatch->startp[i] == NULL)
+ return QF_FAIL;
+ fields->type = *regmatch->startp[i];
+ }
+ if (fmt_ptr->flags == '+' && !qf_multiscan) /* %+ */
+ {
+ if (linelen >= fields->errmsglen)
+ {
+ /* linelen + null terminator */
+ if ((fields->errmsg = vim_realloc(fields->errmsg,
This way of calling realloc leaks memory if realloc(…) fails i.e. if it
returns NULL.
See https://www.viva64.com/en/w/v701/ for more details.
Thanks for pointing this out. I have pushed out a new commit that
fixes this issue. I have also fixed other places in quickfix.c where
vim_realloc() is used.
Thanks,
Yegappan
…
________________________________
In src/quickfix.c:
> + if ((fields->errmsg = vim_realloc(fields->errmsg,
+ linelen + 1)) == NULL)
+ return QF_NOMEM;
+ fields->errmsglen = linelen + 1;
+ }
+ vim_strncpy(fields->errmsg, linebuf, linelen);
+ }
+ else if ((i = (int)fmt_ptr->addr[5]) > 0) /* %m */
+ {
+ if (regmatch->startp[i] == NULL || regmatch->endp[i] == NULL)
+ return QF_FAIL;
+ len = (int)(regmatch->endp[i] - regmatch->startp[i]);
+ if (len >= fields->errmsglen)
+ {
+ /* len + null terminator */
+ if ((fields->errmsg = vim_realloc(fields->errmsg, len + 1))
Same remark: leak if vim_realloc(…) returns NULL.
________________________________
In src/quickfix.c:
> +}
+
+/*
+ * Parse a non-error line (a line which doesn't match any of the error
+ * format in 'efm').
+ */
+ static int
+qf_parse_line_nomatch(char_u *linebuf, int linelen, qffields_T *fields)
+{
+ fields->namebuf[0] = NUL; /* no match found, remove file name */
+ fields->lnum = 0; /* don't jump to this line */
+ fields->valid = FALSE;
+ if (linelen >= fields->errmsglen)
+ {
+ /* linelen + null terminator */
+ if ((fields->errmsg = vim_realloc(fields->errmsg,
Leak if vim_realloc(…) fails.
|
Codecov Report
@@ Coverage Diff @@
## master #2881 +/- ##
==========================================
+ Coverage 75.53% 75.55% +0.02%
==========================================
Files 92 92
Lines 134866 134900 +34
==========================================
+ Hits 101867 101930 +63
+ Misses 32999 32970 -29
Continue to review full report at Codecov.
|
adizero
pushed a commit
to adizero/vim
that referenced
this pull request
May 19, 2018
Problem: qf_parse_line() is too long.
Solution: Split it in parts. Properly handle vim_realloc() failing.
(Yegappan Lakshmanan, closes vim#2881)
mhinz
added a commit
to mhinz/neovim
that referenced
this pull request
Apr 3, 2019
Problem: qf_parse_line() is too long.
Solution: Split it in parts. Properly handle vim_realloc() failing.
(Yegappan Lakshmanan, closes vim/vim#2881)
vim/vim@18cebf4
mhinz
added a commit
to mhinz/neovim
that referenced
this pull request
Apr 4, 2019
Problem: qf_parse_line() is too long.
Solution: Split it in parts. Properly handle vim_realloc() failing.
(Yegappan Lakshmanan, closes vim/vim#2881)
vim/vim@18cebf4
mhinz
added a commit
to mhinz/neovim
that referenced
this pull request
Apr 8, 2019
Problem: qf_parse_line() is too long.
Solution: Split it in parts. Properly handle vim_realloc() failing.
(Yegappan Lakshmanan, closes vim/vim#2881)
vim/vim@18cebf4
mhinz
added a commit
to mhinz/neovim
that referenced
this pull request
Apr 8, 2019
Problem: qf_parse_line() is too long.
Solution: Split it in parts. Properly handle vim_realloc() failing.
(Yegappan Lakshmanan, closes vim/vim#2881)
vim/vim@18cebf4
mhinz
added a commit
to mhinz/neovim
that referenced
this pull request
Apr 19, 2019
Problem: qf_parse_line() is too long.
Solution: Split it in parts. Properly handle vim_realloc() failing.
(Yegappan Lakshmanan, closes vim/vim#2881)
vim/vim@18cebf4
mhinz
added a commit
to mhinz/neovim
that referenced
this pull request
May 3, 2019
Problem: qf_parse_line() is too long.
Solution: Split it in parts. Properly handle vim_realloc() failing.
(Yegappan Lakshmanan, closes vim/vim#2881)
vim/vim@18cebf4
mhinz
added a commit
to mhinz/neovim
that referenced
this pull request
May 3, 2019
Problem: qf_parse_line() is too long.
Solution: Split it in parts. Properly handle vim_realloc() failing.
(Yegappan Lakshmanan, closes vim/vim#2881)
vim/vim@18cebf4
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The qf_parse_line() function in quickfix.c is too long. Refactor the function.
Add additional comments to some of the functions. No new functionality
is introduced in this patch.