mirror of
https://github.com/libsdl-org/SDL.git
synced 2025-10-05 01:16:26 +00:00
Fixed crash if initialization of EGL failed but was tried again later.
The internal function SDL_EGL_LoadLibrary() did not delete and remove a mostly uninitialized data structure if loading the library first failed. A later try to use EGL then skipped initialization and assumed it was previously successful because the data structure now already existed. This led to at least one crash in the internal function SDL_EGL_ChooseConfig() because a NULL pointer was dereferenced to make a call to eglBindAPI().
This commit is contained in:
65
src/joystick/sort_controllers.py
Executable file
65
src/joystick/sort_controllers.py
Executable file
@@ -0,0 +1,65 @@
|
||||
#!/usr/bin/env python
|
||||
#
|
||||
# Script to sort the game controller database entries in SDL_gamecontroller.c
|
||||
|
||||
import re
|
||||
|
||||
|
||||
filename = "SDL_gamecontrollerdb.h"
|
||||
input = open(filename)
|
||||
output = open(filename + ".new", "w")
|
||||
parsing_controllers = False
|
||||
controllers = []
|
||||
controller_guids = {}
|
||||
split_pattern = re.compile(r'([^"]*")([^,]*,)([^,]*,)([^"]*)(".*)')
|
||||
|
||||
def save_controller(line):
|
||||
global controllers
|
||||
match = split_pattern.match(line)
|
||||
entry = [ match.group(1), match.group(2), match.group(3) ]
|
||||
bindings = sorted(match.group(4).split(","))
|
||||
if (bindings[0] == ""):
|
||||
bindings.pop(0)
|
||||
entry.extend(",".join(bindings) + ",")
|
||||
entry.append(match.group(5))
|
||||
controllers.append(entry)
|
||||
|
||||
def write_controllers():
|
||||
global controllers
|
||||
global controller_guids
|
||||
for entry in sorted(controllers, key=lambda entry: entry[2]):
|
||||
line = "".join(entry) + "\n"
|
||||
if not line.endswith(",\n") and not line.endswith("*/\n"):
|
||||
print("Warning: '%s' is missing a comma at the end of the line" % (line))
|
||||
if (entry[1] in controller_guids):
|
||||
print("Warning: entry '%s' is duplicate of entry '%s'" % (entry[2], controller_guids[entry[1]][2]))
|
||||
controller_guids[entry[1]] = entry
|
||||
|
||||
output.write(line)
|
||||
controllers = []
|
||||
controller_guids = {}
|
||||
|
||||
for line in input:
|
||||
if (parsing_controllers):
|
||||
if (line.startswith("{")):
|
||||
output.write(line)
|
||||
elif (line.startswith(" NULL")):
|
||||
parsing_controllers = False
|
||||
write_controllers()
|
||||
output.write(line)
|
||||
elif (line.startswith("#if")):
|
||||
print("Parsing " + line.strip())
|
||||
output.write(line)
|
||||
elif (line.startswith("#endif")):
|
||||
write_controllers()
|
||||
output.write(line)
|
||||
else:
|
||||
save_controller(line)
|
||||
else:
|
||||
if (line.startswith("static const char *s_ControllerMappings")):
|
||||
parsing_controllers = True
|
||||
|
||||
output.write(line)
|
||||
|
||||
output.close()
|
||||
print("Finished writing %s.new" % filename)
|
Reference in New Issue
Block a user