Don't crash on empty filename parameters in the content-disposition header.

kolab/issue3914
MERGE: none (but write KMime unit test)

svn path=/branches/kdepim/enterprise4/kdepim/; revision=1077028
wilder-work
Thomas McGuire 16 years ago
parent 926550fc54
commit bd995347b5
  1. 12
      kmmsgpart.cpp

@ -436,11 +436,15 @@ QString KMMessagePart::fileName( void ) const
// search the end of the filename
int endOfFilename;
if ( '"' == mContentDisposition[startOfFilename] ) {
startOfFilename++; // the double quote isn't part of the filename
endOfFilename = mContentDisposition.indexOf( '"', startOfFilename ) - 1;
if ( mContentDisposition.length() > startOfFilename ) {
if ( '"' == mContentDisposition[startOfFilename] ) {
startOfFilename++; // the double quote isn't part of the filename
endOfFilename = mContentDisposition.indexOf( '"', startOfFilename ) - 1;
} else {
endOfFilename = mContentDisposition.indexOf( ';', startOfFilename ) - 1;
}
} else {
endOfFilename = mContentDisposition.indexOf( ';', startOfFilename ) - 1;
endOfFilename = startOfFilename;
}
if ( endOfFilename < 0 ) {
endOfFilename = 32767;

Loading…
Cancel
Save