abc/lwip
1
0
Fork 0
mirror of https://git.savannah.nongnu.org/git/lwip.git synced 2025-08-04 13:34:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug #50090 (ast_unsent->oversize_left can become wrong value in tcp_write error path)

Browse Source 
(cherry picked from commit 21737f57e53c9207f4f31da768aebdd160f6cdad)
This commit is contained in:
sg 2017-02-08 21:42:30 +01:00 committed by goldsimon
parent bb2b2be454
commit 99ef13f2be
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/tcp_out.c
View File

@ -376,6 +376,9 @@ tcp_write(struct tcp_pcb *pcb, const void *arg, u16_t len, u8_t apiflags)
#if TCP_OVERSIZE #if TCP_OVERSIZE
u16_t oversize = 0; u16_t oversize = 0;
u16_t oversize_used = 0; u16_t oversize_used = 0;
#if TCP_OVERSIZE_DBGCHECK
u16_t oversize_add = 0;
#endif /* TCP_OVERSIZE_DBGCHECK*/
#endif /* TCP_OVERSIZE */ #endif /* TCP_OVERSIZE */
u16_t extendlen = 0; u16_t extendlen = 0;
#if TCP_CHECKSUM_ON_COPY #if TCP_CHECKSUM_ON_COPY
@ -505,7 +508,7 @@ tcp_write(struct tcp_pcb *pcb, const void *arg, u16_t len, u8_t apiflags)
goto memerr; goto memerr;
} }
#if TCP_OVERSIZE_DBGCHECK #if TCP_OVERSIZE_DBGCHECK
last_unsent->oversize_left += oversize; oversize_add = oversize;
#endif /* TCP_OVERSIZE_DBGCHECK */ #endif /* TCP_OVERSIZE_DBGCHECK */
TCP_DATA_COPY2(concat_p->payload, (const u8_t*)arg + pos, seglen, &concat_chksum, &concat_chksum_swapped); TCP_DATA_COPY2(concat_p->payload, (const u8_t*)arg + pos, seglen, &concat_chksum, &concat_chksum_swapped);
#if TCP_CHECKSUM_ON_COPY #if TCP_CHECKSUM_ON_COPY
@ -656,6 +659,11 @@ tcp_write(struct tcp_pcb *pcb, const void *arg, u16_t len, u8_t apiflags)
* All three segmentation phases were successful. We can commit the * All three segmentation phases were successful. We can commit the
* transaction. * transaction.
*/ */
#if TCP_OVERSIZE_DBGCHECK
if ((last_unsent != NULL) && (oversize_add != 0)) {
last_unsent->oversize_left += oversize_add;
}
#endif /* TCP_OVERSIZE_DBGCHECK */
/* /*
* Phase 1: If data has been added to the preallocated tail of * Phase 1: If data has been added to the preallocated tail of