From 9ea18fc5769b4b674ec736ed19b00b8a6d7ff773 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20B=C3=BCscher?= <christoph@elastic.co>
Date: Tue, 8 Dec 2015 15:50:44 +0100
Subject: [PATCH] Adding checks for unexpected tokens in parser

---
 .../org/elasticsearch/search/highlight/HighlightBuilder.java  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/src/main/java/org/elasticsearch/search/highlight/HighlightBuilder.java b/core/src/main/java/org/elasticsearch/search/highlight/HighlightBuilder.java
index c9479aa72fb..3233673f9d4 100644
--- a/core/src/main/java/org/elasticsearch/search/highlight/HighlightBuilder.java
+++ b/core/src/main/java/org/elasticsearch/search/highlight/HighlightBuilder.java
@@ -278,6 +278,8 @@ public class HighlightBuilder extends AbstractHighlighterBuilder<HighlightBuilde
                 } else {
                     throw new ParsingException(parser.getTokenLocation(), "cannot parse object with name [{}]", topLevelFieldName);
                 }
+            } else if (topLevelFieldName != null) {
+                throw new ParsingException(parser.getTokenLocation(), "unexpected token [{}] after [{}]", token, topLevelFieldName);
             }
         }
 
@@ -482,6 +484,8 @@ public class HighlightBuilder extends AbstractHighlighterBuilder<HighlightBuilde
                     } else {
                         throw new ParsingException(parser.getTokenLocation(), "cannot parse object with name [{}]", currentFieldName);
                     }
+                } else if (currentFieldName != null) {
+                    throw new ParsingException(parser.getTokenLocation(), "unexpected token [{}] after [{}]", token, currentFieldName);
                 }
             }
             return field;