Bug 586768 - Incubator qt embedding: QMozView crashes if QMozApp is inited before. r=mark.finkle

Author: tmeshkova

common/EmbeddingSetup.cpp

@@ -22,6 +22,7 @@
  *   Pelle Johnsen <[email protected]>
  *   Dave Camp <[email protected]>
  *   Tobias Hunger <[email protected]>
+ *   Tatiana Meshkova <[email protected]>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -246,8 +247,9 @@ nsresult InitEmbedding(const char* aProfilePath)
     }
 
     // setup profile dir
-    if (aProfilePath) {
-        rv = NS_NewNativeLocalFile(nsCString(aProfilePath), PR_FALSE,
+    nsCString pr(aProfilePath);
+    if (!pr.IsEmpty()) {
+        rv = NS_NewNativeLocalFile(pr, PR_FALSE,
                                    getter_AddRefs(sProfileDir));
         NS_ENSURE_SUCCESS(rv, rv);
     } else {

qt/QMozApp.cpp

@@ -22,6 +22,7 @@
  *   Pelle Johnsen <[email protected]>
  *   Tobias Hunger <[email protected]>
  *   Steffen Imhof <[email protected]>
+ *   Tatiana Meshkova <[email protected]>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -49,7 +50,7 @@ class QMozApp::Private
 };
 
 QMozApp::QMozApp(const QString& profilePath) :
-    mPrivate(new Private(profilePath.toUtf8()))
+    mPrivate(new Private(profilePath.toUtf8().data()))
 {
 }