From d778d2a96042dc06432c6abaea7da871b4dd4142 Mon Sep 17 00:00:00 2001
From: John Christopher Anderson <jchris@apache.org>
Date: Wed, 18 Feb 2009 07:47:57 +0000
Subject: Better error messages on decoding invalid JSON. Changes the CouchDB
 version of mochijson2. Closes COUCHDB-258

git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@745401 13f79535-47bb-0310-9956-ffa450edef68
---
 src/mochiweb/mochijson2.erl | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/mochiweb')

diff --git a/src/mochiweb/mochijson2.erl b/src/mochiweb/mochijson2.erl
index 668486fc..9b59c7df 100644
--- a/src/mochiweb/mochijson2.erl
+++ b/src/mochiweb/mochijson2.erl
@@ -70,7 +70,10 @@ decoder(Options) ->
 %% @spec decode(iolist()) -> json_term()
 %% @doc Decode the given iolist to Erlang terms.
 decode(S) ->
-    json_decode(S, #decoder{}).
+    try json_decode(S, #decoder{})
+    catch
+        _:_ -> throw({invalid_json, S})
+    end.
 
 test() ->
     test_all().
-- 
cgit v1.2.3