From 723f6e8e2bbbe19ed0f16b1034b301fd8403e826 Mon Sep 17 00:00:00 2001 From: Bruce Hauman Date: Sun, 12 Aug 2018 14:43:19 -0400 Subject: [PATCH] better safer solution to reading result of ns form that returns js --- sidecar/src/figwheel_sidecar/components/figwheel_server.clj | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sidecar/src/figwheel_sidecar/components/figwheel_server.clj b/sidecar/src/figwheel_sidecar/components/figwheel_server.clj index a14426ea..8ea0bb47 100644 --- a/sidecar/src/figwheel_sidecar/components/figwheel_server.clj +++ b/sidecar/src/figwheel_sidecar/components/figwheel_server.clj @@ -39,13 +39,11 @@ (defn read-msg [data] (try - (let [msg - (binding [*read-eval* false - *default-data-reader-fn* (fn [tag res] res)] - (read-string data))] + (let [msg (edn/read-string {:readers {'js identity 'object identity}} data)] (if (and (map? msg) (:figwheel-event msg)) msg {})) (catch Exception e (println "Figwheel: message from client couldn't be read!") + (println (Throwable->map e)) {}))) (defn validate-file-selected-msg [{:keys [file-name file-line file-column] :as msg}]