ports/52522: [PATCH] Unbreak www/p5-CGI-SpeedyCGI on 5.x

[Lars Thegler]

>Number:         52522
>Category:       ports
>Synopsis:       [PATCH] Unbreak www/p5-CGI-SpeedyCGI on 5.x
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed May 21 03:30:12 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Lars Thegler
>Release:        FreeBSD 4.7-STABLE i386
>Organization:
>Environment:
System: FreeBSD dask.thegler.dk 4.7-STABLE FreeBSD 4.7-STABLE #8: Sun Feb 9 10:50:10 CET 2003 root at dask.thegler.dk:/usr/obj/usr/src/sys/GENERIC i386


>Description:
Fix www/p5-CGI-SpeedyCGI pointer overruns under FreeBSD 5.x.
Solves ports/51474. Thanks to tobez for helping with this.

>How-To-Repeat:
>Fix:

--- p5-CGI-SpeedyCGI.diff begins here ---
diff -ruN /usr/ports/www/p5-CGI-SpeedyCGI/Makefile p5-CGI-SpeedyCGI/Makefile
--- /usr/ports/www/p5-CGI-SpeedyCGI/Makefile	Wed Apr 30 07:03:39 2003
+++ p5-CGI-SpeedyCGI/Makefile	Wed May 21 11:44:33 2003
@@ -7,7 +7,7 @@
 
 PORTNAME=	CGI-SpeedyCGI
 PORTVERSION=	2.21
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	CGI
diff -ruN /usr/ports/www/p5-CGI-SpeedyCGI/files/patch-speedy_opt.c p5-CGI-SpeedyCGI/files/patch-speedy_opt.c
--- /usr/ports/www/p5-CGI-SpeedyCGI/files/patch-speedy_opt.c	Thu Jan  1 01:00:00 1970
+++ p5-CGI-SpeedyCGI/files/patch-speedy_opt.c	Tue May 20 11:12:22 2003
@@ -0,0 +1,20 @@
+--- src/speedy_opt.c	Mon Sep 30 07:19:54 2002
++++ /tmp/speedy_opt.c	Tue May 20 11:11:28 2003
+@@ -165,6 +165,8 @@ static void cmdline_split(
+ 		    ++p;
+ 	    if (*p)
+ 		strlist_append(doing_speedy_opts ? speedy_opts : perl_args, *p);
++	    else
++		break;
+ 	}
+ 
+ 	if (*p) {
+@@ -422,7 +424,7 @@ const char * const *speedy_opt_script_ar
+ }
+ 
+ SPEEDY_INLINE const char *speedy_opt_script_fname(void) {
+-    return exec_argv.ptrs[script_argv_loc];
++    return exec_argv.len > script_argv_loc ? exec_argv.ptrs[script_argv_loc] : NULL;
+ }
+ 
+ #ifdef SPEEDY_BACKEND
--- p5-CGI-SpeedyCGI.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: