Wrap parser creation so that bad char sequences do not cause 500

libs/x-content/impl/src/main/java/org/elasticsearch/xcontent/provider/json/JsonXContentImpl.java

@@ -18,11 +18,13 @@
 import org.elasticsearch.xcontent.XContent;
 import org.elasticsearch.xcontent.XContentBuilder;
 import org.elasticsearch.xcontent.XContentGenerator;
+import org.elasticsearch.xcontent.XContentParseException;
 import org.elasticsearch.xcontent.XContentParser;
 import org.elasticsearch.xcontent.XContentParserConfiguration;
 import org.elasticsearch.xcontent.XContentType;
 import org.elasticsearch.xcontent.provider.XContentImplUtils;
 
+import java.io.CharConversionException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -96,21 +98,37 @@ private XContentParser createParser(XContentParserConfiguration config, JsonPars
 
     @Override
     public XContentParser createParser(XContentParserConfiguration config, String content) throws IOException {
-        return createParser(config, jsonFactory.createParser(content));
+        try {
+            return createParser(config, jsonFactory.createParser(content));
+        } catch (CharConversionException e) {
+            throw new XContentParseException(null, e.getMessage(), e);
+        }
     }
 
     @Override
     public XContentParser createParser(XContentParserConfiguration config, InputStream is) throws IOException {
-        return createParser(config, jsonFactory.createParser(is));
+        try {
+            return createParser(config, jsonFactory.createParser(is));
+        } catch (CharConversionException e) {
+            throw new XContentParseException(null, e.getMessage(), e);
+        }
     }
 
     @Override
     public XContentParser createParser(XContentParserConfiguration config, byte[] data, int offset, int length) throws IOException {
+        try {
         return createParser(config, jsonFactory.createParser(data, offset, length));
+        } catch (CharConversionException e) {
+            throw new XContentParseException(null, e.getMessage(), e);
+        }
     }
 
     @Override
     public XContentParser createParser(XContentParserConfiguration config, Reader reader) throws IOException {
+        try {
         return createParser(config, jsonFactory.createParser(reader));
+        } catch (CharConversionException e) {
+            throw new XContentParseException(null, e.getMessage(), e);
+        }
     }
 }