ETM-Schurig
/
nymea
mirror of https://github.com/nymea/nymea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge PR #553: Fix a python plugin crash when trying to login with empty credentials

pull/566/head
jenkins 2022-08-26 12:58:02 +02:00
parent c8760863d0 fc8c9df40e
commit 878a9f9042
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libnymea-core/integrations/pythonintegrationplugin.cpp
View File

@ -505,8 +505,9 @@ void PythonIntegrationPlugin::confirmPairing(ThingPairingInfo *info, const QStri
PyEval_ReleaseThread(m_threadState);
});
PyObject *pyUsername = PyUnicode_FromString(username.toUtf8().data());
PyObject *pySecret = PyUnicode_FromString(secret.toUtf8().data());
// PyUnicode_FromString crashes on empty strings. Creating a new empty python string instead.
PyObject *pyUsername = username.isEmpty() ? PyUnicode_New(1, 127) : PyUnicode_FromString(username.toUtf8().data());
PyObject *pySecret = secret.isEmpty() ? PyUnicode_New(1, 127) : PyUnicode_FromString(secret.toUtf8().data());
bool result = callPluginFunction("confirmPairing", reinterpret_cast<PyObject*>(pyInfo), pyUsername, pySecret);
if (!result) {
info->finish(Thing::ThingErrorHardwareFailure, "Plugin error: " + pluginName());