Skip to content

Three actual/potential memory errors #73

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dirkf wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Three actual/potential memory errors #73

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0fcfb3c
Write entire highlight string for a single-line comment
dirkf Dec 19, 2020
28bf46d
Avoid stepping past line end in an incomplete string when \ is last char
dirkf Dec 19, 2020
531b6fd
Avoid invalid memory access if rest of line is shorter than some keyword
dirkf Dec 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions kilo.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ void editorUpdateSyntax(erow *row) {
/* Handle // comments. */
if (prev_sep && *p == scs[0] && *(p+1) == scs[1]) {
/* From here to end is a comment */
memset(row->hl+i,HL_COMMENT,row->size-i);
memset(row->hl+i,HL_COMMENT,row->rsize-i);
return;
}

Expand Down Expand Up @@ -442,7 +442,7 @@ void editorUpdateSyntax(erow *row) {
/* Handle "" and '' */
if (in_string) {
row->hl[i] = HL_STRING;
if (*p == '\\') {
if (*p == '\\' && *(p+1)) {
row->hl[i+1] = HL_STRING;
p += 2; i += 2;
prev_sep = 0;
Expand Down Expand Up @@ -481,12 +481,13 @@ void editorUpdateSyntax(erow *row) {
/* Handle keywords and lib calls */
if (prev_sep) {
int j;
int ileft = row->rsize - i;
for (j = 0; keywords[j]; j++) {
int klen = strlen(keywords[j]);
int kw2 = keywords[j][klen-1] == '|';
if (kw2) klen--;

if (!memcmp(p,keywords[j],klen) &&
if (klen < ileft && !memcmp(p,keywords[j],klen) &&
is_separator(*(p+klen)))
{
/* Keyword */
Expand Down