diff --git a/debug/org.eclipse.cdt.debug.ui/ChangeLog b/debug/org.eclipse.cdt.debug.ui/ChangeLog
index dc6921ee6ea..92af5c057fa 100644
--- a/debug/org.eclipse.cdt.debug.ui/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.ui/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-23 Mikhail Khodjaiants
+	Workaround for bug 69728: IndexOutOfBoundsException in TextPresentation.
+	This bug is fixed in Eclipse 3.1.
+	* DisassemblyView.java
+
 2004-11-18 Mikhail Khodjaiants
 	Fix for bug 69184: Activate the Expression view when expression is added.
 	* AddExpressionEditorActionDelegate.java
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/disassembly/DisassemblyView.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/disassembly/DisassemblyView.java
index 6ed85711926..67895a96695 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/disassembly/DisassemblyView.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/disassembly/DisassemblyView.java
@@ -459,8 +459,13 @@ public class DisassemblyView extends AbstractDebugEventHandlerView
 		}
 		getSourceViewer().setDocument( getDocumentProvider().getDocument( input ), 
 									   getDocumentProvider().getAnnotationModel( input ) );
-		if ( input instanceof DisassemblyEditorInput )
-			getSourceViewer().changeTextPresentation( createTextPresentation( ((DisassemblyEditorInput)input).getSourceRegions() ), true );
+		if ( input instanceof DisassemblyEditorInput ) {
+			// Workaround for bug #69728
+			IRegion[] sourceRegions = ((DisassemblyEditorInput)input).getSourceRegions();
+			if ( sourceRegions.length > 0 ) {
+				getSourceViewer().changeTextPresentation( createTextPresentation( sourceRegions ), true );
+			}
+		}
 		updateObjects();
 	}