sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

webclient.c: Limit the number of redirections

Browse Source
This commit is contained in:
YAMAMOTO Takashi 2020-05-25 23:21:07 +09:00 committed by Xiang Xiao
parent 6b00c37a65
commit e939e55a50
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
netutils/webclient/webclient.c
View File

@ -103,6 +103,11 @@
# define CONFIG_WEBCLIENT_TIMEOUT 10 # define CONFIG_WEBCLIENT_TIMEOUT 10
#endif #endif
#ifndef CONFIG_WEBCLIENT_MAX_REDIRECT
/* The default value 50 is taken from curl's --max-redirs option. */
# define CONFIG_WEBCLIENT_MAX_REDIRECT 50
#endif
#define WEBCLIENT_STATE_STATUSLINE 0 #define WEBCLIENT_STATE_STATUSLINE 0
#define WEBCLIENT_STATE_HEADERS 1 #define WEBCLIENT_STATE_HEADERS 1
#define WEBCLIENT_STATE_DATA 2 #define WEBCLIENT_STATE_DATA 2
@ -467,6 +472,7 @@ static int wget_base(FAR const char *url, FAR char *buffer, int buflen,
struct wget_s *ws; struct wget_s *ws;
struct timeval tv; struct timeval tv;
bool redirected; bool redirected;
unsigned int nredirect = 0;
char *dest; char *dest;
int sockfd; int sockfd;
int len; int len;
@ -685,6 +691,13 @@ static int wget_base(FAR const char *url, FAR char *buffer, int buflen,
else else
{ {
redirected = true; redirected = true;
nredirect++;
if (nredirect > CONFIG_WEBCLIENT_MAX_REDIRECT)
{
nerr("ERROR: too many redirects (%u)\n", nredirect);
goto errout;
}
close(sockfd); close(sockfd);
break; break;
} }