Skip to content
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

Jump to bottom

line numbering and diff metadata #4

Open
lkraav opened this issue Nov 12, 2010 · 0 comments
Open

line numbering and diff metadata #4

lkraav opened this issue Nov 12, 2010 · 0 comments
Labels
component:diff Diff UI

Comments

@lkraav
Copy link

lkraav commented Nov 12, 2010

when picking out hunks to stage, the diff line numbers don't match with tig's line numbering. they are offset by the diff header. my initial feeling is the line numbering should display the lines inside the file, but i might be missing something here. lmk please.
@jasontibbitts jasontibbitts mentioned this issue Feb 19, 2015
Closed
@mherrb mherrb mentioned this issue Apr 18, 2015
Closed
@comicfans comicfans mentioned this issue Apr 3, 2016
Closed
@stevenyvr987 stevenyvr987 mentioned this issue Jun 1, 2019
Merged
abhinav added a commit to abhinav/tig that referenced this issue Aug 2, 2023
@abhinav
update_view_title: Fix NULL dereference at startup
b3a2bc8 
update_view_title can be called with a `struct view`
where `line` is NULL, and `lines` is 0.

Specifically, along this call stack:

    #0  update_view_title (view=0x3fdb88 <main_view>) at [...]/tig/src/view.c:690
    jonas#1  0x0000000000338018 in report_clear () at [...]/tig/src/display.c:565
    jonas#2  0x00000000003cfe5b in load_view (view=0x3fdb88 <main_view>, prev=0x3fdb88 <main_view>, flags=OPEN_
        at [...]/tig/src/view.c:857
    jonas#3  0x00000000003d0bc0 in open_view (prev=0x0, view=0x3fdb88 <main_view>, flags=OPEN_DEFAULT)
        at [...]/tig/src/view.c:894
    jonas#4  0x00000000003b2932 in open_main_view (prev=0x0, flags=OPEN_DEFAULT) at include/tig/main.h:57
    jonas#5  0x00000000003b0cca in view_driver (view=0x0, request=REQ_VIEW_MAIN) at [...]/tig/src/tig.c:179
    jonas#6  0x00000000003af96a in main (argc=1, argv=0x7fffffffddb8) at [...]/tig/src/tig.c:864

Specifically, load_view calls report_clear when `view->lines == 0`,
which calls `update_view_title`, which attempts `&view->line[...]`
on a null `line`.

It's not clear why this doesn't explode today.
I caught it when I ran tig compiled with Zig in debug mode
and it failed with an illegal instruction on the line:

    struct line *line = &view->line[view->pos.lineno];

Adding a check for `NULL` or `lines == 0` resolves the issue.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
component:diff Diff UI
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@lkraav