Skip to content

Commit 2fc6d33

Browse files
author
ThePBone
committed
Fix potential segfault
1 parent f3c84f9 commit 2fc6d33

File tree

3 files changed

+3
-6
lines changed

3 files changed

+3
-6
lines changed

crashhandler/stacktrace.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ void * calculateOffset(char * stackFrameString)
9898
void * objectFile;
9999
void * address;
100100
void * offset = NULL;
101-
char symbolString[750] = {'\0'};
101+
char symbolString[1200] = {'\0'};
102102
char offsetString[25] = {'\0'};
103103
int checkSscanf = EOF;
104104
int checkDladdr = 0;

mainwindow.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1330,10 +1330,7 @@ QVariantMap MainWindow::readConfig(){
13301330
std::ostream os(&fb);
13311331
os << default_config;
13321332
fb.close();
1333-
conf->setConfigMap(readConfig());
1334-
LoadConfig();
1335-
m_irsNeedUpdate = true;
1336-
ApplyConfig();
1333+
confmap = ConfigIO::readFile(m_appwrapper->getPath());
13371334
}
13381335
return confmap;
13391336
}

mainwindow.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2907,7 +2907,7 @@
29072907
<string>Reset</string>
29082908
</property>
29092909
<property name="icon">
2910-
<iconset theme="ok">
2910+
<iconset>
29112911
<normaloff>.</normaloff>.</iconset>
29122912
</property>
29132913
</widget>

0 commit comments

Comments
 (0)