From f02826c5a0a5a3e6f6ececfe87cc70821a585a7c Mon Sep 17 00:00:00 2001
From: Lightning <LightningTH@GMail.com>
Date: Mon, 25 Oct 2021 08:55:37 -0700
Subject: [PATCH] Fix null pointer deref when environment variable doesn't
 exist. (#16)

* Fix null pointer deref when environment variable doesn't exist. Causes cpp to crash every time

* Remove lines per Ethan

* Add cpp to release archive

* This isn't docker wanting a file list :P
---
 .github/workflows/build.yml | 20 +-------------------
 cccp.c                      |  5 +++++
 2 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5d40604..3d47a21 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -55,25 +55,7 @@ jobs:
         shell: bash
         run: |
           cp xgcc gcc
-          tar -cf ${{ matrix.TARGET.ARCHIVE_NAME }} cc1 gcc cc1plus g++
-      - name: Clean
-        shell: bash
-        run: |
-          make clean
-      - name: Configure for mips
-        shell: bash
-        run: |
-          ./configure --target=mips --prefix=/opt/cross --with-gnu-as --disable-gprof --disable-gdb --disable-werror --host=${{ matrix.TARGET.HOST }} --build=${{ matrix.TARGET.HOST }}
-      - name: Make cpp
-        continue-on-error: true
-        shell: bash
-        run: |
-          make cpp CFLAGS="${{ matrix.TARGET.CFLAGS }}"
-      - name: Add cpp to release archive
-        shell: bash
-        run: |
-          tar -uf ${{ matrix.TARGET.ARCHIVE_NAME }} cpp
-          gzip -9 ${{ matrix.TARGET.ARCHIVE_NAME }}
+          tar -cf ${{ matrix.TARGET.ARCHIVE_NAME }} cc1 gcc cc1plus g++ cpp
       - name: Upload archive
         uses: actions/upload-artifact@v2
         with:
diff --git a/cccp.c b/cccp.c
index c9c88cc..0d2a9c6 100644
--- a/cccp.c
+++ b/cccp.c
@@ -1172,6 +1172,11 @@ kanjienv_check ()
 {
   char  *n64kanji_env;
   n64kanji_env = getenv("N64GCC_KANJI");
+  if ( !n64kanji_env ) {
+    n64kanji_flag = KANJI_OFF;
+    return;
+  }
+
   if ( !strcasecmp( n64kanji_env, "SJIS" ) ) {
     n64kanji_flag = KANJI_SJIS;
   } else if ( !strcasecmp( n64kanji_env, "EUC" ) ) {