From: Joe Orton <jorton@apache.org>
Date: Tue, 22 Jan 2013 11:50:45 +0000 (+0000)
Subject: Merge 1436401 from trunk:
X-Git-Tag: 2.4.4~92
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aaaa5a087fe5916c69084a7627bb95fe8aa097dc;p=apache

Merge 1436401 from trunk:

* support/htcacheclean.c (main): Ensure -p was used before attempting
  to process URL arguments.

Reviewed by: jorton, rpluem, rjung


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1436846 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index cadc8ed2b8..92e47029ea 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,8 @@
 
 Changes with Apache 2.4.4
 
+  *) htcacheclean: Fix potential segfault if "-p" is omitted.  [Joe Orton]
+
   *) mod_proxy_http: Honour special value 0 (unlimited) of LimitRequestBody
      PR 54435.  [Pavel Mateja <pavel netsafe.cz>]
 
diff --git a/support/htcacheclean.c b/support/htcacheclean.c
index f093410ca1..4150936fbb 100644
--- a/support/htcacheclean.c
+++ b/support/htcacheclean.c
@@ -1620,6 +1620,10 @@ int main(int argc, const char * const argv[])
         usage(NULL);
     }
 
+    if (!proxypath) {
+         usage("Option -p must be specified");
+    }
+
     if (o->ind < argc) {
         int deleted = 0;
         int error = 0;
@@ -1671,10 +1675,6 @@ int main(int argc, const char * const argv[])
          usage("Option -i cannot be used without -d");
     }
 
-    if (!proxypath) {
-         usage("Option -p must be specified");
-    }
-
     if (!listurls && max <= 0 && inodes <= 0) {
          usage("At least one of option -l or -L must be greater than zero");
     }