From: William A. Rowe Jr <wrowe@apache.org>
Date: Tue, 7 Aug 2001 15:15:53 +0000 (+0000)
Subject:   Thanks rbb, and the modproxy-dev autobuild report for pointing these out.
X-Git-Tag: 2.0.23~31
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ecfff915357389b5b7acad1adfaee48d26726b14;p=apache

  Thanks rbb, and the modproxy-dev autobuild report for pointing these out.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89983 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/generators/mod_autoindex.c b/modules/generators/mod_autoindex.c
index a8807a252a..80a3a66d7f 100644
--- a/modules/generators/mod_autoindex.c
+++ b/modules/generators/mod_autoindex.c
@@ -1420,7 +1420,7 @@ static void output_directories(struct ent **ar, int n,
     int desc_width;
     char *name_scratch;
     char *pad_scratch;
-    char *breakrow;
+    char *breakrow = "";
 
     apr_pool_create(&scratch, r->pool);
     if (name[0] == '\0') {
@@ -1499,8 +1499,6 @@ static void output_directories(struct ent **ar, int n,
         if (!(autoindex_opts & SUPPRESS_RULES))
             breakrow = apr_psprintf(r->pool, "<tr><th colspan=\"%d\">"
                                              "<hr /></th></tr>\n", cols);
-        else
-            breakrow = "";
 	ap_rvputs(r, "</th></tr>", breakrow, NULL);
     }
     else if (autoindex_opts & FANCY_INDEXING) {
@@ -1907,7 +1905,7 @@ static int index_directory(request_rec *r,
                 qstring += qstring[3] ? 4 : 3;
             }
             else if (qstring[0] == 'P' && qstring[1] == '=') {
-                char *eos = strchr(qstring, '&');
+                const char *eos = ap_strchr_c(qstring, '&');
                 if (eos) {
                     pstring = apr_pstrndup(r->pool, qstring + 2, 
                                            eos - qstring - 2);