Upstream version 7.36.151.0

[platform/framework/web/crosswalk.git] / src / xwalk / runtime / android / core / src / org / xwalk / core / XWalkNavigationHistory.java

diff --git a/src/xwalk/runtime/android/core/src/org/xwalk/core/XWalkNavigationHistory.java b/src/xwalk/runtime/android/core/src/org/xwalk/core/XWalkNavigationHistory.java
index 8802288..47582fc 100644 (file)
--- a/src/xwalk/runtime/android/core/src/org/xwalk/core/XWalkNavigationHistory.java
+++ b/src/xwalk/runtime/android/core/src/org/xwalk/core/XWalkNavigationHistory.java
@@ -49,6 +49,7 @@ public final class XWalkNavigationHistory implements Cloneable, Serializable {
      * @return the navigation item for the given index.
      */
     public XWalkNavigationItem getItemAt(int index) {
+        if (index < 0 || index >= size()) return null;
         return new XWalkNavigationItem(mHistory.getEntryAtIndex(index));
     }