зеркало из https://github.com/mozilla/gecko-dev.git
Fix for 24260, crash trying to put the AOLMAIL flavor on the clipboard. I messed up and didn't totally remove it so we promised it was there but then the conversion didn't happen and trying to free the zero-length data didn't work too well. r=sdagley
This commit is contained in:
Родитель
7ac034530e
Коммит
8edfe61c6c
|
@ -131,9 +131,14 @@ nsXIFFormatConverter::GetOutputDataFlavors(nsISupportsArray **_retval)
|
|||
rv = AddFlavorToList ( *_retval, kHTMLMime );
|
||||
if ( NS_FAILED(rv) )
|
||||
return rv;
|
||||
#if NOT_NOW
|
||||
// pinkerton
|
||||
// no one uses this flavor right now, so it's just slowing things down. If anyone cares I
|
||||
// can put it back in.
|
||||
rv = AddFlavorToList ( *_retval, kAOLMailMime );
|
||||
if ( NS_FAILED(rv) )
|
||||
return rv;
|
||||
#endif
|
||||
rv = AddFlavorToList ( *_retval, kUnicodeMime );
|
||||
if ( NS_FAILED(rv) )
|
||||
return rv;
|
||||
|
|
Загрузка…
Ссылка в новой задаче