Fixed: Attempts to access nullptr/out of bounds

skyjake · Sep 1, 2019 · 269946c · 269946c
1 parent 4a6df08
commit 269946c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/doomsday/apps/client/src/unix/joystick.cpp b/doomsday/apps/client/src/unix/joystick.cpp
@@ -233,7 +233,8 @@ void Joystick_GetState(joystate_t *state)
 de::String Joystick_Name()
 {
 #ifndef DE_NO_SDL
-    return SDL_JoystickName(joy);
+    const char *joyName = SDL_JoystickName(joy);
+    return joyName ? joyName : "";
 #else
     return "";
 #endif

diff --git a/doomsday/libs/core/src/data/string.cpp b/doomsday/libs/core/src/data/string.cpp
@@ -82,14 +82,12 @@ String::String(const std::wstring &text)
 
 String::String(const char *nullTerminatedCStr)
 {
-    DE_ASSERT(nullTerminatedCStr != nullptr);
-    initCStr_String(&_str, nullTerminatedCStr);
+    initCStr_String(&_str, nullTerminatedCStr ? nullTerminatedCStr : "");
 }
 
 String::String(const wchar_t *nullTerminatedWideStr)
 {
-    DE_ASSERT(nullTerminatedWideStr != nullptr);
-    initWide_String(&_str, nullTerminatedWideStr);
+    initWide_String(&_str, nullTerminatedWideStr ? nullTerminatedWideStr : L"");
 }
 
 String::String(char const *cStr, int length)

diff --git a/doomsday/libs/shell/src/abstractlineeditor.cpp b/doomsday/libs/shell/src/abstractlineeditor.cpp
@@ -144,12 +144,13 @@ DE_PIMPL(AbstractLineEditor)
         DE_ASSERT(lineOff == 1 || lineOff == -1);
 
         const LineBytePos linePos = lineCursorPos();
-        const auto destWidth = wraps->rangeWidth({lineSpan(linePos.line).range.begin(), cursorPtr()});
 
         // Check for no room.
         if (!linePos.line && lineOff < 0) return false;
         if (linePos.line == wraps->height() - 1 && lineOff > 0) return false;
 
+        const auto destWidth = wraps->rangeWidth({lineSpan(linePos.line).range.begin(), cursorPtr()});
+
         // Move cursor onto the adjacent line.
         WrappedLine span = lineSpan(linePos.line + lineOff);
         cursor = wraps->indexAtWidth(span.range, destWidth);