[Scummvm-git-logs] scummvm master -> ade345b975ecfb9e7ebb50c487c4d62a85ae11ec

[ccawley2011]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
ade345b975 SDL: Fix crash with certain key combos on AmigaOS 4


Commit: ade345b975ecfb9e7ebb50c487c4d62a85ae11ec
    https://github.com/scummvm/scummvm/commit/ade345b975ecfb9e7ebb50c487c4d62a85ae11ec
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2021-01-17T14:47:09Z

Commit Message:
SDL: Fix crash with certain key combos on AmigaOS 4

Changed paths:
    backends/events/sdl/sdl-events.cpp


diff --git a/backends/events/sdl/sdl-events.cpp b/backends/events/sdl/sdl-events.cpp
index 292ab95691..ca52af9996 100644
--- a/backends/events/sdl/sdl-events.cpp
+++ b/backends/events/sdl/sdl-events.cpp
@@ -38,6 +38,9 @@
 #define GAMECONTROLLERDB_FILE "gamecontrollerdb.txt"
 
 static uint32 convUTF8ToUTF32(const char *src) {
+	if (!src || src[0] == 0)
+		return 0;
+
 	Common::U32String u32(src);
 	return u32[0];
 }