bcollet/socat
1
0
Fork 0
mirror of https://repo.or.cz/socat.git synced 2025-01-08 22:12:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

dropopts must not free()

Browse source
This commit is contained in:
Gerhard Rieger 2011-11-27 10:49:28 +01:00
parent 3ef7b3e366
commit 1c302dc23c
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGES
View file

@ -56,6 +56,9 @@ corrections:
UDP-LISTEN slept 1s after accepting a connection. This is not required. UDP-LISTEN slept 1s after accepting a connection. This is not required.
Thanks to Peter Valdemar Morch for reporting this issue Thanks to Peter Valdemar Morch for reporting this issue
fixed a bug that could lead to error or socat crash after a client
connection with option retry had been established
porting: porting:
Cedril Priscal ported socat to Android (using Googles cross compiler). Cedril Priscal ported socat to Android (using Googles cross compiler).
The port includes the socat_buildscript_for_android.sh script The port includes the socat_buildscript_for_android.sh script

3
xioopts.c
View file

@ -4173,9 +4173,8 @@ int _xio_openlate(struct single *fd, struct opt *opts) {
int dropopts(struct opt *opts, unsigned int phase) { int dropopts(struct opt *opts, unsigned int phase) {
struct opt *opt; struct opt *opt;
/*!*/
if (phase == PH_ALL) { if (phase == PH_ALL) {
free(opts); opts[0].desc = ODESC_END;
return 0; return 0;
} }
opt = opts; while (opt && opt->desc != ODESC_END) { opt = opts; while (opt && opt->desc != ODESC_END) {