Raise BadRequest if JSON decode fails (closes django-tastypie#1053)

Previously anything which caused an error in the underlying
`simplejson.loads` call was not caught. Now ValueErrors are converted
into BadRequest so they'll generate an HTTP 400

tastypie/serializers.py

@@ -381,7 +381,10 @@ def from_json(self, content):
         """
         Given some JSON data, returns a Python dictionary of the decoded data.
         """
-        return simplejson.loads(content)
+        try:
+            return simplejson.loads(content)
+        except ValueError:
+            raise BadRequest
 
     def to_jsonp(self, data, options=None):
         """

tests/core/tests/serializers.py

@@ -270,6 +270,11 @@ def test_from_json(self):
         self.assertEqual(sample_1['date_joined'], u'2010-03-27')
         self.assertEqual(sample_1['snowman'], u'☃')
 
+    def test_from_broken_json(self):
+        serializer = Serializer()
+        data = '{"foo": "bar",NO CARRIER'
+        self.assertRaises(BadRequest, serializer.from_json, data)
+
     def test_round_trip_xml(self):
         serializer = Serializer()
         sample_data = self.get_sample2()