You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by gl...@apache.org on 2005/04/09 17:44:35 UTC
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
glenn 2005/04/09 08:44:35
Modified: jk/native/apache-2.0 mod_jk.c
Log:
BUG: 34357 Apache 2 JkAutoAlias segfault
In some situations Apache 2 mod_jk could segfault
when the JkAutoAlias directive is used.
Added an additional null pointer test.
Revision Changes Path
1.135 +3 -2 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Index: mod_jk.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- mod_jk.c 26 Mar 2005 09:37:10 -0000 1.134
+++ mod_jk.c 9 Apr 2005 15:44:35 -0000 1.135
@@ -2482,7 +2482,8 @@
/* Special case to make sure that apache can serve a directory
listing if there are no matches for the DirectoryIndex and
Tomcat webapps are mapped into apache using JkAutoAlias. */
- if (r->main != NULL && (conf->alias_dir != NULL) &&
+ if (r->main != NULL && r->main->handler != NULL &&
+ (conf->alias_dir != NULL) &&
!strcmp(r->main->handler, DIR_MAGIC_TYPE)) {
/* Append the request uri to the JkAutoAlias directory and
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org