From: Eric Covener <covener@apache.org>
Date: Wed, 9 Mar 2016 18:23:23 +0000 (+0000)
Subject: followup to r1734125: null check for r->args
X-Git-Tag: 2.5.0-alpha~1931
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3de12400634fec9563f36316e3ee91f23a4e1e33;p=apache

followup to r1734125: null check for r->args
before cleaning up some QSA cases.



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

diff --git a/modules/mappers/mod_rewrite.c b/modules/mappers/mod_rewrite.c
index 549b5a4f25..44ad8c6ae5 100644
--- a/modules/mappers/mod_rewrite.c
+++ b/modules/mappers/mod_rewrite.c
@@ -790,12 +790,15 @@ static void splitout_queryargs(request_rec *r, int qsappend, int qsdiscard,
             r->args = apr_pstrdup(r->pool, q);
         }
 
-        len = strlen(r->args);
-        if (!len) {
-            r->args = NULL;
-        }
-        else if (r->args[len-1] == '&') {
-            r->args[len-1] = '\0';
+        if (r->args) { 
+           len = strlen(r->args);
+      
+           if (!len) {
+               r->args = NULL;
+           }
+           else if (r->args[len-1] == '&') {
+               r->args[len-1] = '\0';
+           }
         }
 
         rewritelog((r, 3, NULL, "split uri=%s -> uri=%s, args=%s", olduri,