cvs: php4 /ext/standard http_fopen_wrapper.c

edink Fri Oct 19 11:54:06 2001 EDT Modified files: /php4/ext/standard http_fopen_wrapper.c Log: Changed strncpy=>strlcpy; strncat=>strlcat Index: php4/ext/standard/http_fopen_wrapper.c diff -u php4/ext/standard/http_fopen_wrapper.c:1.18 php4/ext/standard/http_fopen_wrapper.c:1.19 --- php4/ext/standard/http_fopen_wrapper.c:1.18 Mon Oct 15 19:30:40 2001 +++ php4/ext/standard/http_fopen_wrapper.c Fri Oct 19 11:54:05 2001 @@ -17,7 +17,7 @@ | Hartmut Holzgraefe <hholzgra@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: http_fopen_wrapper.c,v 1.18 2001/10/15 23:30:40 edink Exp $ */ +/* $Id: http_fopen_wrapper.c,v 1.19 2001/10/19 15:54:05 edink Exp $ */ #include "php.h" #include "php_globals.h" @@ -278,7 +278,7 @@ *new_path='\0'; if (strlen(location)<8 || strncasecmp(location, "http://", 7)) { strcpy(new_path, "http://"); - strncat(new_path, resource->host, sizeof(new_path)-strlen(new_path)-1); + strlcat(new_path, resource->host, sizeof(new_path)-strlen(new_path)-1); if (resource->port != 80) { snprintf(new_path+strlen(new_path), sizeof(new_path)-strlen(new_path)-1, ":%d", resource->port); } @@ -286,10 +286,10 @@ php_dirname(resource->path, strlen(resource->path)); snprintf (new_path+strlen(new_path), sizeof(new_path)-strlen(new_path)-1, "%s/", resource->path); } - strncat(new_path, location, sizeof(new_path)-strlen(new_path)-1); + strlcat(new_path, location, sizeof(new_path)-strlen(new_path)-1); } else { - strncpy(new_path, location, sizeof(new_path)); + strlcpy(new_path, location, sizeof(new_path)); } php_url_free(resource); fp = php_fopen_url_wrap_http(new_path, mode, options, issock, socketd, opened_path TSRMLS_CC);