From 7998629ad256823b1b487486691793db070aa9a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Camilla=20L=C3=B6wy?= <elmindreda@elmindreda.org>
Date: Sun, 14 Jan 2024 23:30:32 +0100
Subject: [PATCH] Linux: Fix regfree being called on invalid data

This was caused by a careless merge that did not take the differences
between the branches into account.

Regression introduced by 7c7cc59889883fa0c19daee122373271670e3b26.

Fixes #2464
---
 CONTRIBUTORS.md      | 1 +
 README.md            | 2 +-
 src/linux_joystick.c | 2 --
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 01783375..6f2d0f9b 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -202,6 +202,7 @@ video tutorials.
  - Aleksey Rybalkin
  - Mikko Rytkönen
  - Riku Salminen
+ - Anton Samokhvalov
  - Brandon Schaefer
  - Sebastian Schuberth
  - Christian Sdunek
diff --git a/README.md b/README.md
index 7c59dea9..a23d146b 100644
--- a/README.md
+++ b/README.md
@@ -123,7 +123,7 @@ information on what to include when reporting a bug.
 
 ## Changelog
 
-There is nothing here yet.
+ - [Linux] Bugfix: `regfree´ was called on invalid data (#2464)
 
 
 ## Contact
diff --git a/src/linux_joystick.c b/src/linux_joystick.c
index 63b43da9..e4101feb 100644
--- a/src/linux_joystick.c
+++ b/src/linux_joystick.c
@@ -334,8 +334,6 @@ void _glfwTerminateJoysticksLinux(void)
             closeJoystick(js);
     }
 
-    regfree(&_glfw.linjs.regex);
-
     if (_glfw.linjs.inotify > 0)
     {
         if (_glfw.linjs.watch > 0)