httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Randy Terbush <ra...@hyperreal.com>
Subject cvs commit: apache/src CHANGES util_script.c
Date Mon, 03 Mar 1997 05:01:46 GMT
randy       97/03/02 21:01:46

  Modified:    src       CHANGES util_script.c
  Log:
  Remove unnecessary call to va_end() in create_argv().
  Reviewed by: Chuck Murcko, Dean Gaudet
  
  Revision  Changes    Path
  1.181     +5 -0      apache/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /export/home/cvs/apache/src/CHANGES,v
  retrieving revision 1.180
  retrieving revision 1.181
  diff -C3 -r1.180 -r1.181
  *** CHANGES	1997/02/25 20:56:37	1.180
  --- CHANGES	1997/03/03 05:01:43	1.181
  ***************
  *** 1,3 ****
  --- 1,8 ----
  + Changes with Apache 1.2b8
  + 
  +   *) Remove unnecessary call to va_end() in create_argv() which
  +      caused a SEGV on some systems.
  + 
    Changes with Apache 1.2b7
    
      *) Port to  UXP/DS(V20) [Toshiaki Nomura <nom@yk.fujitsu.co.jp>]
  
  
  
  1.46      +4 -7      apache/src/util_script.c
  
  Index: util_script.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/util_script.c,v
  retrieving revision 1.45
  retrieving revision 1.46
  diff -C3 -r1.45 -r1.46
  *** util_script.c	1997/02/10 11:47:24	1.45
  --- util_script.c	1997/03/03 05:01:44	1.46
  ***************
  *** 91,97 ****
    	
    	unescape_url(t);
    	av[idx] = escape_shell_cmd(r->pool, t);
  - 	av[idx] = t;
    	idx++;
    	if (idx >= APACHE_ARG_MAX-1) break;
    	
  --- 91,96 ----
  ***************
  *** 99,113 ****
    	    unescape_url(t);
    	    assert(idx < APACHE_ARG_MAX);
    	    av[idx] = escape_shell_cmd(r->pool, t);
  - 	    av[idx] = t;
    	    idx++;
    	    if (idx >= APACHE_ARG_MAX-1) break;
    	}
  - 	va_end(args);
        }
        va_end(args);
    
  !     av[idx] = '\0';
        return av;
    }
    
  --- 98,110 ----
    	    unescape_url(t);
    	    assert(idx < APACHE_ARG_MAX);
    	    av[idx] = escape_shell_cmd(r->pool, t);
    	    idx++;
    	    if (idx >= APACHE_ARG_MAX-1) break;
    	}
        }
        va_end(args);
    
  !     av[idx] = NULL;
        return av;
    }
    
  ***************
  *** 538,544 ****
    	    execv("CMD.EXE", create_argv_cmd(r->pool, argv0, r->args, r->filename));
    	}
    	else
  ! 	    execv(r->filename, create_argv(r, argv0, r->args, NULL));
        }
        }
    #else
  --- 535,541 ----
    	    execv("CMD.EXE", create_argv_cmd(r->pool, argv0, r->args, r->filename));
    	}
    	else
  ! 	    execv(r->filename, create_argv(r, argv0, r->args, (void *)NULL));
        }
        }
    #else
  ***************
  *** 579,585 ****
    
      	else {
    	    execve(SUEXEC_BIN,
  ! 		   create_argv(r, SUEXEC_BIN, execuser, gr->gr_name, argv0, r->args, NULL),
    		   env);
    	}
        }
  --- 576,582 ----
    
      	else {
    	    execve(SUEXEC_BIN,
  ! 		   create_argv(r, SUEXEC_BIN, execuser, gr->gr_name, argv0, r->args, (void *)NULL),
    		   env);
    	}
        }
  ***************
  *** 591,597 ****
    	    execle(r->filename, argv0, NULL, env);
    
    	else
  ! 	    execve(r->filename, create_argv(r, argv0, r->args, NULL), env);
        }
    #endif
    }
  --- 588,594 ----
    	    execle(r->filename, argv0, NULL, env);
    
    	else
  ! 	    execve(r->filename, create_argv(r, argv0, r->args, (void *)NULL), env);
        }
    #endif
    }
  
  
  

Mime
View raw message