cvs: /php3 ChangeLog fopen-wrappers.c

sas Sun Jul 18 20:43:59 1999 EDT Modified files: /php3 ChangeLog fopen-wrappers.c Log: perform additional check Index: php3/ChangeLog diff -u php3/ChangeLog:1.728 php3/ChangeLog:1.729 --- php3/ChangeLog:1.728 Fri Jul 16 16:28:57 1999 +++ php3/ChangeLog Sun Jul 18 20:43:59 1999 @@ -2,6 +2,7 @@ ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ??, Version 3.0.12 +- fix crash on invalid URLs in fopen wrappers (Sascha) - Add support for gd1.6 (disables the ImageCreateFromGif and ImageGif functions because gd1.6 no longer supports GIF format files) (Jim) - Fixed popen and pclose functions on Windows. (Jim) Index: php3/fopen-wrappers.c diff -u php3/fopen-wrappers.c:1.70 php3/fopen-wrappers.c:1.71 --- php3/fopen-wrappers.c:1.70 Sun Jul 18 20:31:51 1999 +++ php3/fopen-wrappers.c Sun Jul 18 20:43:59 1999 @@ -27,7 +27,7 @@ | Jim Winstead <jimw@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: fopen-wrappers.c,v 1.70 1999/07/19 00:31:51 sas Exp $ */ +/* $Id: fopen-wrappers.c,v 1.71 1999/07/19 00:43:59 sas Exp $ */ #ifdef THREAD_SAFE #include "tls.h" @@ -634,6 +634,8 @@ *issock = 1; return (fp); } else if (!strncasecmp(path, "ftp://", 6)) { + if (strlen(path) < 7) + return NULL; resource = url_parse((char *) path); if (resource == NULL) { php3_error(E_WARNING, "Invalid URL specified, %s", path);