dany/ant-http
1
0
Fork 0
mirror of https://github.com/lxsang/ant-http synced 2024-12-27 09:18:22 +01:00
Code Issues Actions Projects Releases Wiki Activity

fix free issues

Browse Source
This commit is contained in:
Xuan Sang LE 2018-02-09 09:21:10 +01:00
parent 8cb088e254
commit f0da9f46f3
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
http_server.c
View File

@ -441,12 +441,17 @@ dictionary decode_request(int client,const char* method, char* url)
char* ctype = NULL; char* ctype = NULL;
char* host = NULL; char* host = NULL;
int clen = -1; int clen = -1;
// first real all header // first real all header
// this for check if web socket is enabled // this for check if web socket is enabled
int ws= 0; int ws= 0;
char* ws_key = NULL; char* ws_key = NULL;
while((line = read_line(client)) && strcmp("\r\n",line)) char buf[BUFFLEN];
//while((line = read_line(client)) && strcmp("\r\n",line))
while((read_buf(client,buf,sizeof(buf))) && strcmp("\r\n",buf))
{ {
line = buf;
trim(line, '\n'); trim(line, '\n');
trim(line, '\r'); trim(line, '\r');
token = strsep(&line,":"); token = strsep(&line,":");
@ -459,7 +464,7 @@ dictionary decode_request(int client,const char* method, char* url)
} }
else if(token != NULL &&strcasecmp(token,"Content-Type") == 0) else if(token != NULL &&strcasecmp(token,"Content-Type") == 0)
{ {
ctype = line; //strsep(&line,":"); ctype = strdup(line); //strsep(&line,":");
trim(ctype,' '); trim(ctype,' ');
} else if(token != NULL &&strcasecmp(token,"Content-Length") == 0) } else if(token != NULL &&strcasecmp(token,"Content-Length") == 0)
{ {
@ -475,7 +480,7 @@ dictionary decode_request(int client,const char* method, char* url)
ws = 1; ws = 1;
}else if(token != NULL && strcasecmp(token,"Host") == 0) }else if(token != NULL && strcasecmp(token,"Host") == 0)
{ {
host = line; host = strdup(line);
} }
else if(token != NULL && strcasecmp(token,"Sec-WebSocket-Key") == 0) else if(token != NULL && strcasecmp(token,"Sec-WebSocket-Key") == 0)
{ {
@ -484,11 +489,12 @@ dictionary decode_request(int client,const char* method, char* url)
ws_key = strdup(line); ws_key = strdup(line);
} }
} }
if(line) free(line); //if(line) free(line);
if(strcmp(method,"GET") == 0) if(strcmp(method,"GET") == 0)
{ {
query = apply_rules(host, url); query = apply_rules(host, url);
if(host) free(host);
if(query) if(query)
{ {
request = decode_url_request(query); request = decode_url_request(query);
@ -510,6 +516,7 @@ dictionary decode_request(int client,const char* method, char* url)
if(ctype == NULL || clen == -1) if(ctype == NULL || clen == -1)
{ {
LOG("Bad request\n"); LOG("Bad request\n");
if(ctype) free(ctype);
return NULL; return NULL;
} }
LOG("ContentType %s\n", ctype); LOG("ContentType %s\n", ctype);
@ -535,6 +542,7 @@ dictionary decode_request(int client,const char* method, char* url)
return NULL; return NULL;
} }
} }
if(ctype) free(ctype);
//if(cookie->key == NULL) {free(cookie);cookie= NULL;} //if(cookie->key == NULL) {free(cookie);cookie= NULL;}
if(!request) if(!request)
request = dict(); request = dict();