From 8498827e67b036379dd6c341f45e7713a2e129bc Mon Sep 17 00:00:00 2001
From: Simon Green <sgreen@redhat.com>
Date: Thu, 24 Jul 2014 17:09:33 +0000
Subject: [PATCH] Bug 1036213 - (CVE-2014-1546) add '/**/' before jsonrpc.cgi
 callback to avoid swf content type sniff vulnerability r=glob,a=sgreen

---
 Bugzilla/WebService/Server/JSONRPC.pm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Bugzilla/WebService/Server/JSONRPC.pm b/Bugzilla/WebService/Server/JSONRPC.pm
index 5ee341b4b1..90334fc7f3 100644
--- a/Bugzilla/WebService/Server/JSONRPC.pm
+++ b/Bugzilla/WebService/Server/JSONRPC.pm
@@ -91,8 +91,9 @@ sub response {
     # Implement JSONP.
     if (my $callback = $self->_bz_callback) {
         my $content = $response->content;
-        $response->content("$callback($content)");
-
+        # Prepend the JSONP response with /**/ in order to protect
+        # against possible encoding attacks (e.g., affecting Flash).
+        $response->content("/**/$callback($content)");
     }
 
     # Use $cgi->header properly instead of just printing text directly.
-- 
2.47.2