Branch: master

bb6df872 2014-05-22 20:07:23 Slávek Banko
Fix potential null pointer dereference
M src/tools/qstring.cpp
diff --git a/src/tools/qstring.cpp b/src/tools/qstring.cpp
index 808a0be..927669c 100644
--- a/src/tools/qstring.cpp
+++ b/src/tools/qstring.cpp
@@ -1513,7 +1513,7 @@
 TQString::TQString( const TQString &s ) :
     d(s.d)
 {
-    if (d != shared_null) {
+    if ( d && (d != shared_null) ) {
 #if defined(QT_THREAD_SUPPORT) && defined(MAKE_TQSTRING_THREAD_SAFE)
         d->mutex->lock();
 #endif // QT_THREAD_SUPPORT && MAKE_TQSTRING_THREAD_SAFE
@@ -1765,7 +1765,7 @@
 */
 TQString &TQString::operator=( const TQString &s )
 {
-    if (s.d != shared_null) {
+    if ( s.d && (s.d != shared_null) ) {
 #if defined(QT_THREAD_SUPPORT) && defined(MAKE_TQSTRING_THREAD_SAFE)
         s.d->mutex->lock();
 #endif // QT_THREAD_SUPPORT && MAKE_TQSTRING_THREAD_SAFE