From c302d6206dfc6169abdc524c5729dd4065b0e27c Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Fri, 21 Aug 2009 19:25:16 +0200 Subject: QMetaObject: Crashes with dbus that tries to connect to all signals The compatibility method QMetaObject::connect did not handle the signal_index = -1 to connect to all signal Reviewed-by: Thiago --- src/corelib/kernel/qobject.cpp | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp index 040efc9..2117a2d 100644 --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp @@ -2981,12 +2981,16 @@ void QObject::disconnectNotify(const char *) bool QMetaObject::connect(const QObject *sender, int signal_index, const QObject *receiver, int method_index, int type, int *types) { - const QMetaObject *mo = sender->metaObject(); - while (mo && mo->methodOffset() > signal_index) - mo = mo->superClass(); - int signalOffset, methodOffset; - computeOffsets(mo, &signalOffset, &methodOffset); - signal_index = QMetaObjectPrivate::originalClone(mo, signal_index - methodOffset) + signalOffset; + if (signal_index > 0) { + const QMetaObject *mo = sender->metaObject(); + while (mo && mo->methodOffset() > signal_index) + mo = mo->superClass(); + if (mo) { + int signalOffset, methodOffset; + computeOffsets(mo, &signalOffset, &methodOffset); + signal_index = QMetaObjectPrivate::originalClone(mo, signal_index - methodOffset) + signalOffset; + } + } return QMetaObjectPrivate::connect(sender, signal_index, receiver, method_index, type, types); } @@ -3059,12 +3063,16 @@ bool QMetaObjectPrivate::connect(const QObject *sender, int signal_index, bool QMetaObject::disconnect(const QObject *sender, int signal_index, const QObject *receiver, int method_index) { - const QMetaObject *mo = sender->metaObject(); - while (mo && mo->methodOffset() > signal_index) - mo = mo->superClass(); - int signalOffset, methodOffset; - computeOffsets(mo, &signalOffset, &methodOffset); - signal_index = QMetaObjectPrivate::originalClone(mo, signal_index - methodOffset) + signalOffset; + if (signal_index > 0) { + const QMetaObject *mo = sender->metaObject(); + while (mo && mo->methodOffset() > signal_index) + mo = mo->superClass(); + if (mo) { + int signalOffset, methodOffset; + computeOffsets(mo, &signalOffset, &methodOffset); + signal_index = QMetaObjectPrivate::originalClone(mo, signal_index - methodOffset) + signalOffset; + } + } return QMetaObjectPrivate::disconnect(sender, signal_index, receiver, method_index); } -- cgit v0.12 From 7a7ea0219f6ebb9f7833649ec76e077796be1843 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Fri, 21 Aug 2009 20:11:14 +0200 Subject: Fix trivial QList detaching: QListData::detach2() *must* memcpy. Qt 4.5 did that and the node_copy function depended on it. I have some patches from Lars that introduce detach3() and try to improve performance a bit more. --- src/corelib/tools/qlist.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/corelib/tools/qlist.cpp b/src/corelib/tools/qlist.cpp index d954160..58406b9 100644 --- a/src/corelib/tools/qlist.cpp +++ b/src/corelib/tools/qlist.cpp @@ -94,7 +94,6 @@ QListData::Data *QListData::detach() /*! * Detaches the QListData by reallocating new memory. * Returns the old (shared) data, it is up to the caller to deref() and free() - * For the new data node_copy needs to be called. * * \internal */ @@ -104,6 +103,7 @@ QListData::Data *QListData::detach2() Data* t = static_cast(qMalloc(DataHeaderSize + x->alloc * sizeof(void *))); Q_CHECK_PTR(t); + ::memcpy(t, x, DataHeaderSize + x->alloc * sizeof(void *)); t->ref = 1; t->sharable = true; t->alloc = x->alloc; -- cgit v0.12 From b15fbecb8a141c12282481529d3b2e1f0d5d9026 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Fri, 21 Aug 2009 20:20:14 +0200 Subject: Don't access usedHashFunc() if it's already been deleted. Problem spotted in Designer: ==13197== Invalid read of size 4 ==13197== at 0x5C9AD2A: QHash::isEmpty() const (qhash.h:283) ==13197== by 0x5C98142: QHash::remove(QString const&) (qhash.h:769) ==13197== by 0x5C8C9FF: QConfFile::~QConfFile() (qsettings.cpp:226) ==13197== by 0x5C9238E: QConfFileSettingsPrivate::~QConfFileSettingsPrivate() (qsettings.cpp:1228) ==13197== by 0x5C9D7AA: QScopedPointerDeleter::cleanup(QObjectData*) (qscopedpointer.h:62) ==13197== by 0x5CF11A4: QScopedPointer >::~QScopedPointer() (qscopedpointer.h:100) ==13197== by 0x5CE9B46: QObject::~QObject() (qobject.cpp:992) ==13197== by 0x5C95C90: QSettings::~QSettings() (qsettings.cpp:2754) ==13197== by 0x5CC1FDC: LibraryData::~LibraryData() (qlibrary.cpp:428) ==13197== by 0x5CC2441: QGlobalStaticDeleter::~QGlobalStaticDeleter() (qglobal.h:1767) ==13197== by 0x5FE16DE: __run_exit_handlers (exit.c:78) ==13197== by 0x5FE174E: exit (exit.c:100) ==13197== by 0x5FCBA3D: (below main) (libc-start.c:252) ==13197== Address 0x0 is not stack'd, malloc'd or (recently) free'd --- src/corelib/io/qsettings.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp index 4c19cbf..8612e03 100644 --- a/src/corelib/io/qsettings.cpp +++ b/src/corelib/io/qsettings.cpp @@ -223,7 +223,8 @@ QConfFile::QConfFile(const QString &fileName, bool _userPerms) QConfFile::~QConfFile() { - usedHashFunc()->remove(name); + if (usedHashFunc()) + usedHashFunc()->remove(name); } ParsedSettingsMap QConfFile::mergedKeyMap() const -- cgit v0.12 From 10a0ed3f2e6a71eced5f470f1c3e09d7be58bbc9 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Fri, 21 Aug 2009 20:29:29 +0200 Subject: Remove the unnecessary double memcpy now too. The previous commit reintroduced memcpy in detach2(). So we don't need to do memcpy here. Re-add the memcpy when detach3() is introduced. --- src/corelib/tools/qlist.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/corelib/tools/qlist.h b/src/corelib/tools/qlist.h index ab6f7bd..5fa0f6c 100644 --- a/src/corelib/tools/qlist.h +++ b/src/corelib/tools/qlist.h @@ -381,9 +381,6 @@ Q_INLINE_TEMPLATE void QList::node_copy(Node *from, Node *to, Node *src) (reinterpret_cast(current--))->~T(); QT_RETHROW; } - } else { - if (src != from && to - from > 0) - memcpy(from, src, (to - from) * sizeof(Node *)); } } -- cgit v0.12 From 3a735d35eeb474ab9b12d3b97b14c4429acef919 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Fri, 21 Aug 2009 20:54:47 +0200 Subject: Using pnginfo and optipng to reduce file size (thus resources size). --- .../fluidlauncher/screenshots/anomaly_s60.png | Bin 47478 -> 39093 bytes .../fluidlauncher/screenshots/context2d_s60.png | Bin 49182 -> 39405 bytes .../screenshots/desktopservices_s60.png | Bin 38216 -> 31757 bytes .../fluidlauncher/screenshots/drilldown_s60.png | Bin 60089 -> 47687 bytes .../screenshots/embeddedsvgviewer_s60.png | Bin 42764 -> 29917 bytes .../fluidlauncher/screenshots/fridgemagnets_s60.png | Bin 45318 -> 39865 bytes .../embedded/fluidlauncher/screenshots/ftp_s60.png | Bin 38370 -> 32534 bytes .../fluidlauncher/screenshots/saxbookmarks_s60.png | Bin 56905 -> 47182 bytes .../fluidlauncher/screenshots/softkeys_s60.png | Bin 40149 -> 28562 bytes .../fluidlauncher/screenshots/styledemo_s60.png | Bin 63062 -> 51957 bytes .../fluidlauncher/screenshots/wiggly_s60.png | Bin 7950 -> 5549 bytes 11 files changed, 0 insertions(+), 0 deletions(-) diff --git a/demos/embedded/fluidlauncher/screenshots/anomaly_s60.png b/demos/embedded/fluidlauncher/screenshots/anomaly_s60.png index b9a73fd..8d537f4 100644 Binary files a/demos/embedded/fluidlauncher/screenshots/anomaly_s60.png and b/demos/embedded/fluidlauncher/screenshots/anomaly_s60.png differ diff --git a/demos/embedded/fluidlauncher/screenshots/context2d_s60.png b/demos/embedded/fluidlauncher/screenshots/context2d_s60.png index a53f5b0..c7225c7 100644 Binary files a/demos/embedded/fluidlauncher/screenshots/context2d_s60.png and b/demos/embedded/fluidlauncher/screenshots/context2d_s60.png differ diff --git a/demos/embedded/fluidlauncher/screenshots/desktopservices_s60.png b/demos/embedded/fluidlauncher/screenshots/desktopservices_s60.png index f4aa1a2..a429be3 100644 Binary files a/demos/embedded/fluidlauncher/screenshots/desktopservices_s60.png and b/demos/embedded/fluidlauncher/screenshots/desktopservices_s60.png differ diff --git a/demos/embedded/fluidlauncher/screenshots/drilldown_s60.png b/demos/embedded/fluidlauncher/screenshots/drilldown_s60.png index 50376c1..d4fd44f 100644 Binary files a/demos/embedded/fluidlauncher/screenshots/drilldown_s60.png and b/demos/embedded/fluidlauncher/screenshots/drilldown_s60.png differ diff --git a/demos/embedded/fluidlauncher/screenshots/embeddedsvgviewer_s60.png b/demos/embedded/fluidlauncher/screenshots/embeddedsvgviewer_s60.png index 11459dc..74f4ad1 100644 Binary files a/demos/embedded/fluidlauncher/screenshots/embeddedsvgviewer_s60.png and b/demos/embedded/fluidlauncher/screenshots/embeddedsvgviewer_s60.png differ diff --git a/demos/embedded/fluidlauncher/screenshots/fridgemagnets_s60.png b/demos/embedded/fluidlauncher/screenshots/fridgemagnets_s60.png index 56da9dc..d31875d 100644 Binary files a/demos/embedded/fluidlauncher/screenshots/fridgemagnets_s60.png and b/demos/embedded/fluidlauncher/screenshots/fridgemagnets_s60.png differ diff --git a/demos/embedded/fluidlauncher/screenshots/ftp_s60.png b/demos/embedded/fluidlauncher/screenshots/ftp_s60.png index ea6a321..5858daf 100644 Binary files a/demos/embedded/fluidlauncher/screenshots/ftp_s60.png and b/demos/embedded/fluidlauncher/screenshots/ftp_s60.png differ diff --git a/demos/embedded/fluidlauncher/screenshots/saxbookmarks_s60.png b/demos/embedded/fluidlauncher/screenshots/saxbookmarks_s60.png index c451198..54b6321 100644 Binary files a/demos/embedded/fluidlauncher/screenshots/saxbookmarks_s60.png and b/demos/embedded/fluidlauncher/screenshots/saxbookmarks_s60.png differ diff --git a/demos/embedded/fluidlauncher/screenshots/softkeys_s60.png b/demos/embedded/fluidlauncher/screenshots/softkeys_s60.png index 03989fb..df090e2 100644 Binary files a/demos/embedded/fluidlauncher/screenshots/softkeys_s60.png and b/demos/embedded/fluidlauncher/screenshots/softkeys_s60.png differ diff --git a/demos/embedded/fluidlauncher/screenshots/styledemo_s60.png b/demos/embedded/fluidlauncher/screenshots/styledemo_s60.png index bad9692..57480fb 100644 Binary files a/demos/embedded/fluidlauncher/screenshots/styledemo_s60.png and b/demos/embedded/fluidlauncher/screenshots/styledemo_s60.png differ diff --git a/demos/embedded/fluidlauncher/screenshots/wiggly_s60.png b/demos/embedded/fluidlauncher/screenshots/wiggly_s60.png index 690ab48..9c4cab3 100644 Binary files a/demos/embedded/fluidlauncher/screenshots/wiggly_s60.png and b/demos/embedded/fluidlauncher/screenshots/wiggly_s60.png differ -- cgit v0.12