File r899969.diff of Package kdepim4
Subject:
fix crashing in templates
From: wstephenson@suse.de
Bug: kde#178038
Patch-upstream: 899969
--- kmail/templateparser.cpp (revision 899968)
+++ kmail/templateparser.cpp (revision 899969)
@@ -203,7 +203,7 @@ void TemplateParser::processWithTemplate
bool dnl = false;
for ( int i = 0; i < tmpl_len; ++i ) {
QChar c = tmpl[i];
- // kDebugug() << "Next char: " << c;
+ // kDebug() << "Next char: " << c;
if ( c == '%' ) {
QString cmd = tmpl.mid( i + 1 );
@@ -833,8 +833,9 @@ void TemplateParser::processWithTemplate
} else if ( dnl && ( c == '\n' || c == '\r') ) {
// skip
- if ( ( c == '\n' && tmpl[i + 1] == '\r' ) ||
- ( c == '\r' && tmpl[i + 1] == '\n' ) ) {
+ if ( ( tmpl.size() > i+1 ) &&
+ ( ( c == '\n' && tmpl[i + 1] == '\r' ) ||
+ ( c == '\r' && tmpl[i + 1] == '\n' ) ) ) {
// skip one more
i += 1;
}
Index: kmail/templateparser.cpp
===================================================================