From 10db0c4c6abc70317e3d2970e8a7c634c7705b14 Mon Sep 17 00:00:00 2001
From: Scott Schneider <sschneider@puppetlabs.com>
Date: Fri, 20 Mar 2015 13:03:29 -0700
Subject: [PATCH] Catch improperly-formatted data payloads

---
 lib/vmpooler/api/v1.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/vmpooler/api/v1.rb b/lib/vmpooler/api/v1.rb
index e54979d..5e8241d 100644
--- a/lib/vmpooler/api/v1.rb
+++ b/lib/vmpooler/api/v1.rb
@@ -504,7 +504,12 @@ module Vmpooler
       params[:hostname] = hostname_shorten(params[:hostname])
 
       if $redis.exists('vmpooler__vm__' + params[:hostname])
-        jdata = JSON.parse(request.body.read)
+        begin
+          jdata = JSON.parse(request.body.read)
+        rescue
+          status 400
+          return JSON.pretty_generate(result)
+        end
 
         # Validate data payload
         jdata.each do |param, arg|