3party/mongoose
0
0
Fork 0
mirror of https://github.com/cesanta/mongoose.git synced 2025-01-17 04:51:03 +08:00
Code Issues Projects Releases Wiki Activity

Make cc3200 sprintf workaround smaller

Browse Source 
in light of the root cause discovered by rojer
and addressed in cesanta/dev#5882 for the http connection code path.

PUBLISHED_FROM=aea563150a0411cbe3fdc6f7911529f3136cc76f
This commit is contained in:
Marko Mikulicic 2016-11-14 17:00:26 +00:00 committed by Cesanta Bot
parent 240eca0b68
commit 74b75899d3
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
mongoose.c
View File

@ -8791,7 +8791,6 @@ void mg_send_websocket_handshake3(struct mg_connection *nc, const char *path,
const char *extra_headers, const char *user, const char *extra_headers, const char *user,
const char *pass) { const char *pass) {
struct mbuf auth; struct mbuf auth;
const char *authstr = "";
char key[25]; char key[25];
uint32_t nonce[4]; uint32_t nonce[4];
nonce[0] = mg_ws_random_mask(); nonce[0] = mg_ws_random_mask();
@ -8803,25 +8802,22 @@ void mg_send_websocket_handshake3(struct mg_connection *nc, const char *path,
mbuf_init(&auth, 0); mbuf_init(&auth, 0);
if (user != NULL) { if (user != NULL) {
mg_basic_auth_header(user, pass, &auth); mg_basic_auth_header(user, pass, &auth);
/*
* cc3200 libc is broken: it doesn't like zero length to be passed to %.*s
* i.e. sprintf("f%.*so", (int)0, ""), yields `f\0o`.
* Thus we ensure the header fragment is null terminated and use `%s` below.
*/
mbuf_append(&auth, "", 1);
authstr = auth.buf;
} }
/*
* NOTE: the (auth.buf == NULL ? "" : auth.buf) is because cc3200 libc is
* broken: it doesn't like zero length to be passed to %.*s
* i.e. sprintf("f%.*so", (int)0, NULL), yields `f\0o`.
* because it handles NULL specially (and incorrectly).
*/
mg_printf(nc, mg_printf(nc,
"GET %s HTTP/1.1\r\n" "GET %s HTTP/1.1\r\n"
"Upgrade: websocket\r\n" "Upgrade: websocket\r\n"
"Connection: Upgrade\r\n" "Connection: Upgrade\r\n"
"%s" "%.*s"
"Sec-WebSocket-Version: 13\r\n" "Sec-WebSocket-Version: 13\r\n"
"Sec-WebSocket-Key: %s\r\n", "Sec-WebSocket-Key: %s\r\n",
path, authstr, key); path, (int) auth.len, (auth.buf == NULL ? "" : auth.buf), key);
/* TODO(mkm): take default hostname from http proto data if host == NULL */ /* TODO(mkm): take default hostname from http proto data if host == NULL */
if (host != MG_WS_NO_HOST_HEADER_MAGIC) { if (host != MG_WS_NO_HOST_HEADER_MAGIC) {