From: Edin Kadribasic <edink@php.net>
Date: Fri, 19 Oct 2001 15:54:05 +0000 (+0000)
Subject: Changed strncpy=>strlcpy; strncat=>strlcat
X-Git-Tag: POST_PARAMETER_PARSING_API~79
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=86959aaf62c0c180454e90b4a6e229fb06288284;p=php

Changed strncpy=>strlcpy; strncat=>strlcat
---

diff --git a/ext/standard/http_fopen_wrapper.c b/ext/standard/http_fopen_wrapper.c
index 9a4132d712..00b4f85d5e 100644
--- a/ext/standard/http_fopen_wrapper.c
+++ b/ext/standard/http_fopen_wrapper.c
@@ -278,7 +278,7 @@ FILE *php_fopen_url_wrap_http(const char *path, char *mode, int options, int *is
 			*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 @@ FILE *php_fopen_url_wrap_http(const char *path, char *mode, int options, int *is
 					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);