maryjane/syncevolution
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

GDBus GIO: avoid segfault when activating object with no signals or no methods

Browse source 
array[len - 1] accesses an invalid element when the method or signal
array is empty. Need to check length first.
This commit is contained in:
Patrick Ohly 2012-01-13 14:13:15 +01:00
parent ce59a217e2
commit ee9c9cff44
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/gdbusxx/gdbus-cxx-bridge.h
View file

@ -1016,10 +1016,12 @@ class DBusObjectHelper : public DBusObject
if (!m_methods || !m_signals) {
throw std::logic_error("This object was already activated.");
}
if (m_methods->pdata[m_methods->len - 1] != NULL) {
if (m_methods->len &&
m_methods->pdata[m_methods->len - 1] != NULL) {
g_ptr_array_add(m_methods, NULL);
}
if (m_signals->pdata[m_signals->len - 1] != NULL) {
if (m_signals->len &&
m_signals->pdata[m_signals->len - 1] != NULL) {
g_ptr_array_add(m_signals, NULL);
}
GDBusInterfaceInfo *ifInfo = g_new0(GDBusInterfaceInfo, 1);