summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-11-18 14:21:18 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-11-18 14:21:18 -0600
commitb803818239fb8dceacab9b292b38da4b24013f90 (patch)
tree3e3d1ee5ef6604aec48a9dcabd0d8e843290213d
parent82ccf2925e84c8958b4e0aa54e40414add14c219 (diff)
downloadgtk-qt-engine-b803818239fb8dceacab9b292b38da4b24013f90.zip
gtk-qt-engine-b803818239fb8dceacab9b292b38da4b24013f90.tar.gz
Do not register crash handler for Firefox, Thunderbird, Chromium, etc.r14.0.0
-rw-r--r--src/qt_qt_wrapper.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/qt_qt_wrapper.cpp b/src/qt_qt_wrapper.cpp
index d8467ee..a701f52 100644
--- a/src/qt_qt_wrapper.cpp
+++ b/src/qt_qt_wrapper.cpp
@@ -106,7 +106,7 @@ int gtkQtDebug;
Atom kipcCommAtom;
Atom desktopWindowAtom;
-static int argc_fake = 1;
+static const int argc_fake = 2;
static char** argv_fake;
static TDEAboutData aboutData("gtk-qt-engine", I18N_NOOP("gtk-qt-engine"), "v0.1",
@@ -363,10 +363,11 @@ void createTQApp()
// Does baseline internally generate SIGSEGVs as part of normal operation?
cmdlineCrashHandler = "--nocrashhandler";
}
+
int cmdlineCrashHandlerLength = cmdlineCrashHandler.length() + 1;
// Create a new TDEApplication and supply it with fake data to keep its constructor happy
- argv_fake = (char**) malloc(sizeof(char*));
+ argv_fake = (char**) malloc(sizeof(char*)*argc_fake);
argv_fake[0] = (char*) malloc(sizeof(char) * cmdlineAppNameLength);
argv_fake[1] = (char*) malloc(sizeof(char) * cmdlineCrashHandlerLength);
strncpy(argv_fake[0], cmdlineAppName.ascii(), cmdlineAppNameLength);