From 1aa10e5bbf65a26c63f3fcff9d40010cf94690e3 Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Sat, 7 Jan 2012 16:41:44 +0100 Subject: [PATCH] Ignore OutOfMemoryException when trying to paste large amounts of text. --- .../Editing/EditingCommandHandler.cs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/EditingCommandHandler.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/EditingCommandHandler.cs index c622b3e582..72c863771f 100644 --- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/EditingCommandHandler.cs +++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/EditingCommandHandler.cs @@ -387,8 +387,13 @@ namespace ICSharpCode.AvalonEdit.Editing // convert text back to correct newlines for this document string newLine = TextUtilities.GetNewLineFromDocument(textArea.Document, textArea.Caret.Line); - string text = (string)dataObject.GetData(DataFormats.UnicodeText); - text = TextUtilities.NormalizeNewLines(text, newLine); + string text; + try { + text = (string)dataObject.GetData(DataFormats.UnicodeText); + text = TextUtilities.NormalizeNewLines(text, newLine); + } catch (OutOfMemoryException) { + return; + } if (!string.IsNullOrEmpty(text)) { bool fullLine = textArea.Options.CutCopyWholeLine && dataObject.GetDataPresent(LineSelectedType);