From ake@apache.org  Wed Jan 10 15:52:20 2001
Return-Path: <ake@apache.org>
Mailing-List: contact cvs-help@apr.apache.org; run by ezmlm
Delivered-To: mailing list cvs@apr.apache.org
Received: (qmail 68825 invoked by uid 1102); 10 Jan 2001 15:52:20 -0000
Date: 10 Jan 2001 15:52:20 -0000
Message-ID: <20010110155220.68824.qmail@apache.org>
From: ake@apache.org
To: apr-cvs@apache.org
Subject: cvs commit: apr/network_io/win32 sockets.c

ake         01/01/10 07:52:20

  Modified:    network_io/win32 sockets.c
  Log:
  Eliminate trap in apr_palloc due to NULL pool pointer (Windows only)
  
  Revision  Changes    Path
  1.48      +2 -0      apr/network_io/win32/sockets.c
  
  Index: sockets.c
  ===================================================================
  RCS file: /home/cvs/apr/network_io/win32/sockets.c,v
  retrieving revision 1.47
  retrieving revision 1.48
  diff -u -r1.47 -r1.48
  --- sockets.c	2000/12/14 18:42:38	1.47
  +++ sockets.c	2001/01/10 15:52:19	1.48
  @@ -327,6 +327,7 @@
           memcpy(&(*apr_sock)->local_addr->sa.sin, 
                  os_sock_info->local, 
                  (*apr_sock)->local_addr->salen);
  +        (*apr_sock)->local_addr->pool = cont;
       }
       else {
           (*apr_sock)->local_port_unknown = (*apr_sock)->local_interface_unknown = 1;
  @@ -335,6 +336,7 @@
           memcpy(&(*apr_sock)->remote_addr->sa.sin, 
                  os_sock_info->remote,
                  (*apr_sock)->remote_addr->salen);
  +        (*apr_sock)->remote_addr->pool = cont;
       }
           
       apr_register_cleanup((*apr_sock)->cntxt, (void *)(*apr_sock),