Mirrors/libwebsockets
1
0
Fork 0
mirror of https://github.com/warmcat/libwebsockets.git synced 2025-03-30 00:00:16 +01:00
Code Issues Releases Wiki Activity

lwsws cgi QUERY_STRING fixes

Browse source 
Signed-off-by: Andy Green <andy@warmcat.com>
This commit is contained in:
Andy Green 2016-04-10 16:13:37 +08:00
parent dbb417815d
commit 2a0cc2c47d
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/libwebsockets.c
View file

@ -1536,7 +1536,7 @@ lws_urlencode(const char *in, int inlen, char *out, int outlen)
const char *hex = "0123456789ABCDEF"; const char *hex = "0123456789ABCDEF";
char *start = out, *end = out + outlen; char *start = out, *end = out + outlen;
while (inlen-- && out > end - 4) { while (inlen-- && out < end - 4) {
if ((*in >= 'A' && *in <= 'Z') || if ((*in >= 'A' && *in <= 'Z') ||
(*in >= 'a' && *in <= 'z') || (*in >= 'a' && *in <= 'z') ||
(*in >= '0' && *in <= '9') || (*in >= '0' && *in <= '9') ||
@ -1642,7 +1642,7 @@ lws_cgi(struct lws *wsi, const char * const *exec_array, int script_uri_path_len
{ {
struct lws_context_per_thread *pt = &wsi->context->pt[(int)wsi->tsi]; struct lws_context_per_thread *pt = &wsi->context->pt[(int)wsi->tsi];
char *env_array[30], cgi_path[400], e[1024], *p = e, char *env_array[30], cgi_path[400], e[1024], *p = e,
*end = p + sizeof(e) - 1, tok[256]; *end = p + sizeof(e) - 1, tok[256], *t;
struct lws_cgi *cgi; struct lws_cgi *cgi;
int n, m, i; int n, m, i;
@ -1730,9 +1730,16 @@ lws_cgi(struct lws *wsi, const char * const *exec_array, int script_uri_path_len
WSI_TOKEN_HTTP_URI_ARGS, m); WSI_TOKEN_HTTP_URI_ARGS, m);
if (i < 0) if (i < 0)
break; break;
i = lws_urlencode(tok, i, p, end - p); t = tok;
while (*t && *t != '=' && p < end - 4)
*p++ = *t++;
if (*t == '=')
*p++ = *t++;
i = lws_urlencode(t, i- (t - tok), p, end - p);
if (i > 0) {
p += i; p += i;
*p++ = '&'; *p++ = '&';
}
m++; m++;
} }
if (m) if (m)
@ -1780,7 +1787,7 @@ lws_cgi(struct lws *wsi, const char * const *exec_array, int script_uri_path_len
env_array[n++] = "PATH=/bin:/usr/bin:/usr/local/bin:/var/www/cgi-bin"; env_array[n++] = "PATH=/bin:/usr/bin:/usr/local/bin:/var/www/cgi-bin";
env_array[n] = NULL; env_array[n] = NULL;
#if 0 #if 1
for (m = 0; m < n; m++) for (m = 0; m < n; m++)
lwsl_err(" %s\n", env_array[m]); lwsl_err(" %s\n", env_array[m]);
#endif #endif