generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

We don't support any long protocol names so we can use a smaller buffer.

Browse Source 
Also, make sure we have room for the trailing zero, only scan to size-1.

Gisle Vanem reported.
This commit is contained in:
Daniel Stenberg
2004-05-07 18:46:28 +00:00
parent d67ea8c7ad
commit 3394c01826
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/url.c
View File

@@ -2148,7 +2148,7 @@ static CURLcode CreateConnection(struct SessionHandle *data,
* proxy -- and we don't know if we will need to use SSL until we parse the * proxy -- and we don't know if we will need to use SSL until we parse the
* url ... * url ...
************************************************************/ ************************************************************/
if((2 == sscanf(data->change.url, "%64[^:]:%[^\n]", if((2 == sscanf(data->change.url, "%15[^:]:%[^\n]",
conn->protostr, conn->protostr,
conn->path)) && strequal(conn->protostr, "file")) { conn->path)) && strequal(conn->protostr, "file")) {
if(conn->path[0] == '/' && conn->path[1] == '/') { if(conn->path[0] == '/' && conn->path[1] == '/') {
@@ -2208,7 +2208,7 @@ static CURLcode CreateConnection(struct SessionHandle *data,
* that missing slash at the beginning of the path. * that missing slash at the beginning of the path.
*/ */
if (2 > sscanf(data->change.url, if (2 > sscanf(data->change.url,
"%64[^\n:]://%[^\n/?]%[^\n]", "%15[^\n:]://%[^\n/?]%[^\n]",
conn->protostr, conn->protostr,
conn->host.name, conn->path)) { conn->host.name, conn->path)) {

2
lib/urldata.h
View File

@@ -438,7 +438,7 @@ struct connectdata {
#else #else
struct sockaddr_in serv_addr; struct sockaddr_in serv_addr;
#endif #endif
char protostr[64]; /* store the protocol string in this buffer */ char protostr[16]; /* store the protocol string in this buffer */
struct hostname host; struct hostname host;
struct hostname proxy; struct hostname proxy;