cvs commit: jakarta-tomcat-connectors/jk/native/common jk_context.c

[hgomez]

hgomez      01/07/02 14:15:02

  Modified:    jk/native/common jk_context.c
  Log:
  Updated context and check added
  
  Revision  Changes    Path
  1.6       +3 -2      jakarta-tomcat-connectors/jk/native/common/jk_context.c
  
  Index: jk_context.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_context.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- jk_context.c      2001/06/29 14:55:22     1.5
  +++ jk_context.c      2001/07/02 21:15:00     1.6
  @@ -58,7 +58,7 @@
   /***************************************************************************
    * Description: Context handling (Autoconf)                                *
    * Author:      Henri Gomez <[EMAIL PROTECTED]>                               *
  - * Version:     $Revision: 1.5 $                                           *
  + * Version:     $Revision: 1.6 $                                           *
    ***************************************************************************/
   
   #include "jk_global.h"
  @@ -164,7 +164,8 @@
           if (! contexts)
               return JK_FALSE;
   
  -        memcpy(contexts, c->contexts, sizeof(jk_context_item_t *) * c->capacity);
  +        if (c->capacity && c->contexts)
  +            memcpy(contexts, c->contexts, sizeof(jk_context_item_t *) * 
c->capacity);
   
           c->contexts = contexts;
           c->capacity = capacity;