JAL-3858 check annotation row and column positioning in case we have been called...

[jalview.git] / src / jalview / gui / AnnotationPanel.java

diff --git a/src/jalview/gui/AnnotationPanel.java b/src/jalview/gui/AnnotationPanel.java
index f01d7be..98e9b3e 100755 (executable)
--- a/src/jalview/gui/AnnotationPanel.java
+++ b/src/jalview/gui/AnnotationPanel.java
@@ -631,7 +631,12 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
       return false;
     }
     int yOffset = rowIndex[1];
-
+    AlignmentAnnotation[] allAnnotation = av.getAlignment()
+            .getAlignmentAnnotation();
+    if (allAnnotation==null || rowIndex[0]<0 || rowIndex[0]>allAnnotation.length)
+    {
+      return false;
+    }
     AlignmentAnnotation clicked = av.getAlignment()
             .getAlignmentAnnotation()[rowIndex[0]];
     if (clicked.graph != AlignmentAnnotation.CONTACT_MAP)