From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 10.213.28.69 with SMTP id l5cs459495ebc; Tue, 19 Jan 2010 13:55:14 -0800 (PST) Received: by 10.224.80.65 with SMTP id s1mr5687104qak.317.1263938113634; Tue, 19 Jan 2010 13:55:13 -0800 (PST) Return-Path: Received: from rubyforge.org (rubyforge.org [205.234.109.19]) by mx.google.com with ESMTP id 5si11239270qwg.28.2010.01.19.13.55.12; Tue, 19 Jan 2010 13:55:13 -0800 (PST) Received-SPF: pass (google.com: domain of sup-devel-bounces@rubyforge.org designates 205.234.109.19 as permitted sender) client-ip=205.234.109.19; Authentication-Results: mx.google.com; spf=pass (google.com: domain of sup-devel-bounces@rubyforge.org designates 205.234.109.19 as permitted sender) smtp.mail=sup-devel-bounces@rubyforge.org Received: from rubyforge.org (rubyforge.org [127.0.0.1]) by rubyforge.org (Postfix) with ESMTP id D3C021D788B8; Tue, 19 Jan 2010 16:55:11 -0500 (EST) X-Greylist: delayed 401 seconds by postgrey-1.31 at rubyforge.org; Tue, 19 Jan 2010 16:55:08 EST Received: from strontium.club.cc.cmu.edu (STRONTIUM.CLUB.CC.CMU.EDU [128.2.204.151]) by rubyforge.org (Postfix) with ESMTP id 1204F18582E4 for ; Tue, 19 Jan 2010 16:55:07 -0500 (EST) Received: (qmail 21861 invoked from network); 19 Jan 2010 21:48:26 -0000 Received: from pion.club.cc.cmu.edu (HELO localhost.localdomain) (128.237.157.88) by strontium.club.cc.cmu.edu with SMTP; 19 Jan 2010 21:48:26 -0000 From: Rich Lane To: sup-devel@rubyforge.org Date: Tue, 19 Jan 2010 16:48:25 -0500 Message-Id: <1263937705-10875-1-git-send-email-rlane@club.cc.cmu.edu> X-Mailer: git-send-email 1.5.6.5 Subject: [sup-devel] [PATCH] asciify untrusted strings before displaying in TextMode X-BeenThere: sup-devel@rubyforge.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: Sup developer discussion List-Id: Sup developer discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: sup-devel-bounces@rubyforge.org Errors-To: sup-devel-bounces@rubyforge.org --- lib/sup/modes/file-browser-mode.rb | 2 +- lib/sup/modes/text-mode.rb | 2 +- lib/sup/modes/thread-view-mode.rb | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/sup/modes/file-browser-mode.rb b/lib/sup/modes/file-browser-mode.rb index b92468d..72e12db 100644 --- a/lib/sup/modes/file-browser-mode.rb +++ b/lib/sup/modes/file-browser-mode.rb @@ -47,7 +47,7 @@ protected return unless f && f.file? begin - BufferManager.spawn f.to_s, TextMode.new(f.read) + BufferManager.spawn f.to_s, TextMode.new(f.read.ascii) rescue SystemCallError => e BufferManager.flash e.message end diff --git a/lib/sup/modes/text-mode.rb b/lib/sup/modes/text-mode.rb index 7c9e7d8..e772ff5 100644 --- a/lib/sup/modes/text-mode.rb +++ b/lib/sup/modes/text-mode.rb @@ -29,7 +29,7 @@ class TextMode < ScrollMode end if output - BufferManager.spawn "Output of '#{command}'", TextMode.new(output) + BufferManager.spawn "Output of '#{command}'", TextMode.new(output.ascii) else BufferManager.flash "'#{command}' done!" end diff --git a/lib/sup/modes/thread-view-mode.rb b/lib/sup/modes/thread-view-mode.rb index b08c819..0e935a4 100644 --- a/lib/sup/modes/thread-view-mode.rb +++ b/lib/sup/modes/thread-view-mode.rb @@ -613,7 +613,7 @@ EOS end if output - BufferManager.spawn "Output of '#{command}'", TextMode.new(output) + BufferManager.spawn "Output of '#{command}'", TextMode.new(output.ascii) else BufferManager.flash "'#{command}' done!" end @@ -815,7 +815,7 @@ private BufferManager.erase_flash BufferManager.completely_redraw_screen unless success - BufferManager.spawn "Attachment: #{chunk.filename}", TextMode.new(chunk.to_s, chunk.filename) + BufferManager.spawn "Attachment: #{chunk.filename}", TextMode.new(chunk.to_s.ascii, chunk.filename) BufferManager.flash "Couldn't execute view command, viewing as text." end end -- 1.5.6.5 _______________________________________________ Sup-devel mailing list Sup-devel@rubyforge.org http://rubyforge.org/mailman/listinfo/sup-devel