From 788f29de940714bc79217144dfec8f6d1c7f6897 Mon Sep 17 00:00:00 2001 From: Tim Angus Date: Mon, 27 Sep 2021 10:56:17 +0100 Subject: [PATCH 1/2] GHA deprecated Ubuntu 16.04 - update to 18.04 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index de630b4e..1e8755ab 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,7 +4,7 @@ on: [push, pull_request] jobs: linux: name: Linux - runs-on: ubuntu-16.04 + runs-on: ubuntu-18.04 steps: - uses: actions/checkout@v2 - name: Install Dependencies From 26780805c80c597c3c4209234385979d548d8380 Mon Sep 17 00:00:00 2001 From: Adam Mizerski Date: Sat, 25 Sep 2021 13:53:33 +0200 Subject: [PATCH 2/2] qsort cannot be called with NULL resolves #519 --- code/qcommon/files.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/qcommon/files.c b/code/qcommon/files.c index 4a94463e..a9f2995a 100644 --- a/code/qcommon/files.c +++ b/code/qcommon/files.c @@ -2932,7 +2932,9 @@ void FS_AddGameDirectory( const char *path, const char *dir ) { // Get .pk3 files pakfiles = Sys_ListFiles(curpath, ".pk3", NULL, &numfiles, qfalse); - qsort( pakfiles, numfiles, sizeof(char*), paksort ); + if ( pakfiles ) { + qsort( pakfiles, numfiles, sizeof(char*), paksort ); + } if ( fs_numServerPaks ) { numdirs = 0;