Guard against ill-formed responses in snow remote-command.

ashinn · Dec 2, 2024 · c437ede · c437ede
1 parent 3716d99
commit c437ede
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/lib/chibi/snow/commands.scm b/lib/chibi/snow/commands.scm
@@ -794,10 +794,18 @@
     (http-post uri params))))
 
 (define (remote-command cfg name path params)
-  (let ((uri (remote-uri cfg name path)))
-    (sxml-display-as-text
-     (read (snow-post cfg uri (cons '(fmt . "sexp") params))))
-    (newline)))
+  (let* ((uri (remote-uri cfg name path))
+         (response
+          (port->string (snow-post cfg uri (cons '(fmt . "sexp") params)))))
+    (guard (exn (else
+                 (display "ERROR: couldn't display sxml response: ")
+                 (write response)
+                 (newline)))
+      (let ((sxml (call-with-input-string response read)))
+        (if (null? sxml)
+            (display "WARN: () response from server")
+            (sxml-display-as-text sxml))
+        (newline)))))
 
 (define (command/reg-key cfg spec)
   (let* ((keys (call-with-input-file