ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-07-24 08:27:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1533 from odin-lang/bug_report

Browse Source 
[report] Fix `odin report` crash if `/usr/lib/os-release` doesn't exist.
This commit is contained in:
Jeroen van Rijn
2022-02-22 17:14:24 +01:00
committed by GitHub
parent e6a7b85da4 2b5bc1d558
commit ea34f321ed
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bug_report.cpp
+2 -2
View File
@@ -473,11 +473,11 @@ void print_bug_report_help() {
#elif defined(GB_SYSTEM_LINUX) #elif defined(GB_SYSTEM_LINUX)
/* /*
Try to parse `/usr/lib/os-release` for `PRETTY_NAME="Ubuntu 20.04.3 LTS` Try to parse `/etc/os-release` for `PRETTY_NAME="Ubuntu 20.04.3 LTS`
*/ */
gbAllocator a = heap_allocator(); gbAllocator a = heap_allocator();
gbFileContents release = gb_file_read_contents(a, 1, "/usr/lib/os-release"); gbFileContents release = gb_file_read_contents(a, 1, "/etc/os-release");
defer (gb_file_free_contents(&release)); defer (gb_file_free_contents(&release));
b32 found = 0; b32 found = 0;
src/gb/gb.h
+1
View File
@@ -6093,6 +6093,7 @@ gbFileContents gb_file_read_contents(gbAllocator a, b32 zero_terminate, char con
} }
void gb_file_free_contents(gbFileContents *fc) { void gb_file_free_contents(gbFileContents *fc) {
if (fc == NULL || fc->size == 0) return;
GB_ASSERT_NOT_NULL(fc->data); GB_ASSERT_NOT_NULL(fc->data);
gb_free(fc->allocator, fc->data); gb_free(fc->allocator, fc->data);
fc->data = NULL; fc->data = NULL;