cvs commit: apache/src mod_negotiation.c

[Mark Cox]

mjc         96/04/02 02:48:50

  Modified:    src       mod_negotiation.c
  Log:
  Watch out for either content_type or handler being NULL or we get SIGSEGVs
  
  Revision  Changes    Path
  1.4       +4 -2      apache/src/mod_negotiation.c
  
  Index: mod_negotiation.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/mod_negotiation.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -C3 -r1.3 -r1.4
  *** mod_negotiation.c 1996/03/31 01:07:03     1.3
  --- mod_negotiation.c 1996/04/02 10:48:49     1.4
  ***************
  *** 669,676 ****
         * we're building...
         */
    
  !     if (!strcmp (sub_req->content_type, MAP_FILE_MAGIC_TYPE) ||
  !         !strcmp (sub_req->handler, "type-map")) {
            closedir(dirp);
            
            neg->avail_vars->nelts = 0;
  --- 669,678 ----
         * we're building...
         */
    
  !     if (((sub_req->content_type) &&
  !          !strcmp (sub_req->content_type, MAP_FILE_MAGIC_TYPE)) || 
  !         ((sub_req->handler) && 
  !         !strcmp (sub_req->handler, "type-map"))) {
            closedir(dirp);
            
            neg->avail_vars->nelts = 0;