Commit 184ad46a authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

fixed accept() for memory debugging

parent 74d35416

lib/ftp.c

+2 −0
Original line number Diff line number Diff line
@@ -197,6 +197,8 @@ static CURLcode AllowServerConnect(struct UrlData *data, 
      getsockname(sock, (struct sockaddr *) &add, (int *)&size);

      s=accept(sock, (struct sockaddr *) &add, (int *)&size);



      sclose(sock); /* close the first socket */



      if( -1 == s) {

	/* DIE! */

	failf(data, "Error accept()ing server connect");

lib/memdebug.c

+9 −0
Original line number Diff line number Diff line
@@ -133,6 +133,15 @@ int curl_socket(int domain, int type, int protocol, int line, char *source) 
  return sockfd;

}



int curl_accept(int s, struct sockaddr *addr, int *addrlen,

                int line, char *source)

{

  int sockfd=(accept)(s, addr, addrlen);

  fprintf(logfile?logfile:stderr, "FD %s:%d accept() = %d\n",

          source, line, sockfd);

  return sockfd;

}



/* this is our own defined way to close sockets on *ALL* platforms */

int curl_sclose(int sockfd, int line, char *source)

{

lib/memdebug.h

+4 −0
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ void curl_memdebug(char *logname); 
/* file descriptor manipulators */

int curl_socket(int domain, int type, int protocol, int, char *);

int curl_sclose(int sockfd, int, char *);

int curl_accept(int s, struct sockaddr *addr, int *addrlen,

                int line, char *source);



/* Set this symbol on the command-line, recompile all lib-sources */

#define strdup(ptr) curl_dostrdup(ptr, __LINE__, __FILE__)
@@ -18,6 +20,8 @@ int curl_sclose(int sockfd, int, char *); 


#define socket(domain,type,protocol)\

 curl_socket(domain,type,protocol,__LINE__,__FILE__)

#define accept(sock,addr,len)\

 curl_accept(sock,addr,len,__LINE__,__FILE__)



/* sclose is probably already defined, redefine it! */

#undef sclose

memanalyze.pl

+5 −0
Original line number Diff line number Diff line
@@ -84,6 +84,11 @@ while(<STDIN>) { 
            $getfile{$1}="$source:$linenum";

            $openfile++;

        }

        elsif($function =~ /accept\(\) = (\d*)/) {

            $filedes{$1}=1;

            $getfile{$1}="$source:$linenum";

            $openfile++;

        }

        elsif($function =~ /sclose\((\d*)\)/) {

            if($filedes{$1} != 1) {

                print "Close without open: $line\n";