diff options
| author | aozima <[email protected]> | 2016-03-02 20:41:14 +0800 |
|---|---|---|
| committer | aozima <[email protected]> | 2016-03-02 20:41:14 +0800 |
| commit | 8131ea9c30e6acd7dd0de5c5b74bb49e56270952 (patch) | |
| tree | 3587849f796035be9b949f39b95df6897c7b5a20 /components | |
| parent | 24d089d80af38e6f97789961c18ab4a2999a16d9 (diff) | |
fixed Lwip bug: Assert on TCP netconn_write with sndtimeout set
ref: http://savannah.nongnu.org/bugs/?38219
Diffstat (limited to 'components')
| -rw-r--r-- | components/net/lwip-1.4.1/src/api/api_msg.c | 1 | ||||
| -rw-r--r-- | components/net/lwip-head/src/api/api_msg.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/components/net/lwip-1.4.1/src/api/api_msg.c b/components/net/lwip-1.4.1/src/api/api_msg.c index d4e44b9ad2..7c58a77bde 100644 --- a/components/net/lwip-1.4.1/src/api/api_msg.c +++ b/components/net/lwip-1.4.1/src/api/api_msg.c @@ -1235,6 +1235,7 @@ do_writemore(struct netconn *conn) /* partial write */ err = ERR_OK; conn->current_msg->msg.w.len = conn->write_offset; + conn->write_offset = 0; } } else #endif /* LWIP_SO_SNDTIMEO */ diff --git a/components/net/lwip-head/src/api/api_msg.c b/components/net/lwip-head/src/api/api_msg.c index f3e4f9a3a7..5442549547 100644 --- a/components/net/lwip-head/src/api/api_msg.c +++ b/components/net/lwip-head/src/api/api_msg.c @@ -1261,6 +1261,7 @@ lwip_netconn_do_writemore(struct netconn *conn) /* partial write */ err = ERR_OK; conn->current_msg->msg.w.len = conn->write_offset; + conn->write_offset = 0; } } else #endif /* LWIP_SO_SNDTIMEO */ |