1
0
mirror of https://github.com/moparisthebest/socat synced 2024-12-22 06:58:47 -05:00

merged corrected "fixed possible SIGSEGV" fix

This commit is contained in:
Gerhard Rieger 2009-05-06 08:21:09 +02:00
commit cfffd8495c
3 changed files with 8 additions and 2 deletions

View File

@ -1,5 +1,9 @@
corrections: corrections:
corrected the "fixed possible SIGSEGV" fix because SIGSEGV still might
occur under those conditions. Thanks to Toni Mattila for first
reporting this problem.
socat crashed on systems without setenv() (esp. SunOS up to Solaris 9); socat crashed on systems without setenv() (esp. SunOS up to Solaris 9);
thanks to Todd Stansell for reporting this bug thanks to Todd Stansell for reporting this bug

View File

@ -1 +1 @@
"1.7.1.0+fixsetenv" "1.7.1.0+sigsegv+fixsetenv"

View File

@ -219,8 +219,10 @@ int _xioopen_listen(struct single *xfd, int xioflags, struct sockaddr *us, sockl
char peername[256]; char peername[256];
char sockname[256]; char sockname[256];
int ps; /* peer socket */ int ps; /* peer socket */
salen = sizeof(struct sockaddr);
pa = &_peername;
la = &_sockname;
salen = sizeof(struct sockaddr);
do { do {
/*? int level = E_ERROR;*/ /*? int level = E_ERROR;*/
Notice1("listening on %s", sockaddr_info(us, uslen, lisname, sizeof(lisname))); Notice1("listening on %s", sockaddr_info(us, uslen, lisname, sizeof(lisname)));