From 596d803944f6498c305ac48d338f6252cbde7ecb Mon Sep 17 00:00:00 2001
From: Frode Solheim <frode@solheim.dev>
Date: Sun, 5 Dec 2021 16:52:36 +0100
Subject: [PATCH] 3.1.64

---
 BASEVERSION.FS          | 2 +-
 libfsemu/src/ml/input.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/BASEVERSION.FS b/BASEVERSION.FS
index f69b7f25e..331ba4bca 100644
--- a/BASEVERSION.FS
+++ b/BASEVERSION.FS
@@ -1 +1 @@
-3.1.42
+3.1.64
diff --git a/libfsemu/src/ml/input.c b/libfsemu/src/ml/input.c
index 91cdb94a1..b9c1c9ae3 100644
--- a/libfsemu/src/ml/input.c
+++ b/libfsemu/src/ml/input.c
@@ -73,6 +73,10 @@ int fs_ml_post_event(fs_ml_event* event)
 
 char *fs_ml_input_fix_joystick_name(const char *name, int upper)
 {
+    if (name == NULL) {
+        return g_strdup("NULL");
+    }
+
     char *n, *temp;
     n = g_strdup(name);
     g_strstrip(n);