head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.46
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.44
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.42
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.40
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2009Q4:1.2.0.38
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2008Q4:1.2.0.36
	pkgsrc-2008Q4-base:1.2
	pkgsrc-2008Q3:1.2.0.34
	pkgsrc-2008Q3-base:1.2
	cube-native-xorg:1.2.0.32
	cube-native-xorg-base:1.2
	pkgsrc-2008Q2:1.2.0.30
	pkgsrc-2008Q2-base:1.2
	pkgsrc-2008Q1:1.2.0.28
	pkgsrc-2008Q1-base:1.2
	pkgsrc-2007Q4:1.2.0.26
	pkgsrc-2007Q4-base:1.2
	pkgsrc-2007Q3:1.2.0.24
	pkgsrc-2007Q3-base:1.2
	pkgsrc-2007Q2:1.2.0.22
	pkgsrc-2007Q2-base:1.2
	pkgsrc-2007Q1:1.2.0.20
	pkgsrc-2007Q1-base:1.2
	pkgsrc-2006Q4:1.2.0.18
	pkgsrc-2006Q4-base:1.2
	pkgsrc-2006Q3:1.2.0.16
	pkgsrc-2006Q3-base:1.2
	pkgsrc-2006Q2:1.2.0.14
	pkgsrc-2006Q2-base:1.2
	pkgsrc-2006Q1:1.2.0.12
	pkgsrc-2006Q1-base:1.2
	pkgsrc-2005Q4:1.2.0.10
	pkgsrc-2005Q4-base:1.2
	pkgsrc-2005Q3:1.2.0.8
	pkgsrc-2005Q3-base:1.2
	pkgsrc-2005Q2:1.2.0.6
	pkgsrc-2005Q2-base:1.2
	pkgsrc-2005Q1:1.2.0.4
	pkgsrc-2005Q1-base:1.2
	pkgsrc-2004Q4:1.2.0.2
	pkgsrc-2004Q4-base:1.2
	pkgsrc-2004Q3:1.1.0.2;
locks; strict;
comment	@# @;


1.2
date	2004.11.28.06.35.31;	author taca;	state dead;
branches;
next	1.1;

1.1
date	2004.11.09.14.11.33;	author taca;	state Exp;
branches
	1.1.2.1;
next	;

1.1.2.1
date	2004.11.09.14.11.33;	author salo;	state dead;
branches;
next	1.1.2.2;

1.1.2.2
date	2004.11.15.21.26.45;	author salo;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Removing ruby-base package since this is obsolete with new framework
for Ruby packages.
@
text
@$NetBSD: patch-ar,v 1.1 2004/11/09 14:11:33 taca Exp $

--- lib/cgi.rb.orig	2002-08-29 18:05:06.000000000 +0900
+++ lib/cgi.rb
@@@@ -823,10 +823,13 @@@@ convert string charset, and set language
           end
 
           c = if bufsize < content_length
-                stdinput.read(bufsize) or ''
+                stdinput.read(bufsize)
               else
-                stdinput.read(content_length) or ''
+                stdinput.read(content_length)
               end
+	  if c.nil?
+	    raise EOFError, "bad content body"
+	  end
           buf += c
           content_length -= c.size
 
@


1.1
log
@Fix potential DoS problem in CGI module from Ruby's CVS repository.
(noted by CAN-2004-0983)

Bump package revision.
@
text
@d1 1
a1 1
$NetBSD$
@


1.1.2.1
log
@file patch-ar was added on branch pkgsrc-2004Q3 on 2004-11-09 14:11:33 +0000
@
text
@d1 20
@


1.1.2.2
log
@Pullup ticket 142 - requested by Takahiro Kambe
security fix for ruby-base

        Module Name:	pkgsrc
        Committed By:	taca
        Date:		Tue Nov  9 14:11:33 UTC 2004

        Modified Files:
        	pkgsrc/lang/ruby-base: Makefile distinfo
        Added Files:
        	pkgsrc/lang/ruby-base/patches: patch-ar

        Log Message:
        Fix potential DoS problem in CGI module from Ruby's CVS repository.
        (noted by CAN-2004-0983)

        Bump package revision.
@
text
@a0 20
$NetBSD: patch-ar,v 1.1.2.1 2004/11/15 21:26:45 salo Exp $

--- lib/cgi.rb.orig	2002-08-29 18:05:06.000000000 +0900
+++ lib/cgi.rb
@@@@ -823,10 +823,13 @@@@ convert string charset, and set language
           end
 
           c = if bufsize < content_length
-                stdinput.read(bufsize) or ''
+                stdinput.read(bufsize)
               else
-                stdinput.read(content_length) or ''
+                stdinput.read(content_length)
               end
+	  if c.nil?
+	    raise EOFError, "bad content body"
+	  end
           buf += c
           content_length -= c.size
 
@