hyprwm/hyprlock
1
0
Fork 0
mirror of https://github.com/hyprwm/hyprlock.git synced 2025-05-12 21:30:37 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

guard against keymap nullptr

Browse source 
avoid this crash:
```
#2  <signal handler called>
#3  xkb_keymap_layout_get_name (keymap=0x0, idx=0) at ../libxkbcommon/src/keymap.c:327
#4  0x00005791d0502cef in replaceAllLayout (str="Layout: $LAYOUT") at /usr/include/c++/14.2.1/bits/unique_ptr.h:193
```
This commit is contained in:
Maximilian Seidler 2025-04-23 08:59:29 +02:00
commit 88f3f7a8f0
4 changed files with 11 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/core/Seat.cpp
View file

@ -134,25 +134,6 @@ void CSeatManager::registerCursorShape(SP<CCWpCursorShapeManagerV1> shape) {
m_pCursorShape = makeUnique<CCursorShape>(shape);
}
std::string CSeatManager::getActiveKbLayoutName() {
if (!m_pXKBState || !m_pXKBKeymap)
return "error";
const auto LAYOUTSNUM = xkb_keymap_num_layouts(m_pXKBKeymap);
for (uint32_t i = 0; i < LAYOUTSNUM; ++i) {
if (xkb_state_layout_index_is_active(m_pXKBState, i, XKB_STATE_LAYOUT_EFFECTIVE) == 1) {
const auto LAYOUTNAME = xkb_keymap_layout_get_name(m_pXKBKeymap, i);
if (LAYOUTNAME)
return std::string{LAYOUTNAME};
return "error";
}
}
return "none";
}
bool CSeatManager::registered() {
return m_pSeat;
}

1
src/core/Seat.hpp
View file

@ -14,7 +14,6 @@ class CSeatManager {
void registerSeat(SP<CCWlSeat> seat);
void registerCursorShape(SP<CCWpCursorShapeManagerV1> shape);
bool registered();
std::string getActiveKbLayoutName();
SP<CCWlKeyboard> m_pKeeb;
SP<CCWlPointer> m_pPointer;

2
src/core/hyprlock.hpp
View file

@ -65,8 +65,6 @@ class CHyprlock {
size_t getPasswordBufferLen();
size_t getPasswordBufferDisplayLen();
std::string getActiveKeyboardLayout();
SP<CCExtSessionLockManagerV1> getSessionLockMgr();
SP<CCExtSessionLockV1> getSessionLock();
SP<CCWlCompositor> getCompositor();

17
src/renderer/widgets/IWidget.cpp
View file

@ -100,11 +100,16 @@ static void replaceAllAttempts(std::string& str) {
}
static void replaceAllLayout(std::string& str) {
std::string layoutName = "error";
const auto LAYOUTIDX = g_pHyprlock->m_uiActiveLayout;
const auto LAYOUTIDX = g_pHyprlock->m_uiActiveLayout;
const auto LAYOUTNAME = g_pSeatManager->getActiveKbLayoutName();
size_t pos = 0;
if (g_pSeatManager->m_pXKBKeymap) {
const auto PNAME = xkb_keymap_layout_get_name(g_pSeatManager->m_pXKBKeymap, LAYOUTIDX);
if (PNAME)
layoutName = PNAME;
}
size_t pos = 0;
while ((pos = str.find("$LAYOUT", pos)) != std::string::npos) {
if (str.substr(pos, 8).ends_with('[') && str.substr(pos).contains(']')) {
const std::string REPL = str.substr(pos + 8, str.find_first_of(']', pos) - 8 - pos);
@ -114,12 +119,12 @@ static void replaceAllLayout(std::string& str) {
continue;
}
const std::string LANG = LANGS[LAYOUTIDX].empty() ? LAYOUTNAME : LANGS[LAYOUTIDX] == "!" ? "" : LANGS[LAYOUTIDX];
const std::string LANG = LANGS[LAYOUTIDX].empty() ? layoutName : LANGS[LAYOUTIDX] == "!" ? "" : LANGS[LAYOUTIDX];
str.replace(pos, 9 + REPL.length(), LANG);
pos += LANG.length();
} else {
str.replace(pos, 7, LAYOUTNAME);
pos += LAYOUTNAME.length();
str.replace(pos, 7, layoutName);
pos += layoutName.length();
}
}
}