Skip to content

stage: fix null pointer arithmetic in stage_insert_chunk() #1417

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
PatriciaBucataru wants to merge 1 commit into
base: master
Choose a base branch
from
+4 −3
Open

stage: fix null pointer arithmetic in stage_insert_chunk() #1417

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 src/stage.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,9 +319,6 @@ stage_insert_chunk(struct view *view, struct chunk_header *header,
struct line *from, struct line *to, struct line *last_unchanged_line)
{
struct box *box;
unsigned long from_lineno = last_unchanged_line - view->line;
unsigned long to_lineno = to - view->line;
unsigned long after_lineno = to_lineno;
int i;

box = from->data;
Expand All @@ -338,6 +335,10 @@ stage_insert_chunk(struct view *view, struct chunk_header *header,
if (!to)
return from;

unsigned long from_lineno = last_unchanged_line - view->line;
unsigned long to_lineno = to - view->line;
unsigned long after_lineno = to_lineno;

// Next diff chunk line
if (!add_line_text_at(view, after_lineno++, "", LINE_DIFF_CHUNK, 1))
return NULL;
Expand Down