Skip to content

Fix out-of-bounds panic parsing timestamps #28

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

Merged
merged 2 commits into from
Sep 9, 2021
Merged

Fix out-of-bounds panic parsing timestamps #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a5ddc2f
Fix out-of-bounds panic parsing timestamps
bluekeyes Sep 9, 2021
eea33b4
Fix test names
bluekeyes Sep 9, 2021
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
2 changes: 1 addition & 1 deletion gitdiff/file_header.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,7 @@ func hasEpochTimestamp(s string) bool {

// a valid timestamp can have optional ':' in zone specifier
// remove that if it exists so we have a single format
if ts[len(ts)-3] == ':' {
if len(ts) >= 3 && ts[len(ts)-3] == ':' {
ts = ts[:len(ts)-3] + ts[len(ts)-2:]
}

Expand Down
8 changes: 8 additions & 0 deletions gitdiff/file_header_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -724,6 +724,14 @@ func TestHasEpochTimestamp(t *testing.T) {
Input: "+++ file.txt\t2019-03-21 12:34:56.789 -0700\n",
Output: false,
},
"notTimestamp": {
Input: "+++ file.txt\trandom text\n",
Output: false,
},
"notTimestampShort": {
Input: "+++ file.txt\t0\n",
Output: false,
},
}

for name, test := range tests {
Expand Down